From: Johannes Sixt <j6t@kdbg•org>
To: Ben Walton <bdwalton@gmail•com>
Cc: gitster@pobox•com, git@vger•kernel.org
Subject: Re: [PATCH 2/2] Fix sed usage in tests to work around broken xpg4/sed on Solaris
Date: Sun, 19 Jul 2015 08:54:57 +0200 [thread overview]
Message-ID: <55AB49C1.8010105@kdbg.org> (raw)
In-Reply-To: <1437232892-27978-1-git-send-email-bdwalton@gmail.com>
Am 18.07.2015 um 17:21 schrieb Ben Walton:
> The space following the last / in a sed command caused Solaris'
> xpg4/sed to fail, claiming the program was garbled and exit with
> status 2:
>
> % echo 'foo' | /usr/xpg4/bin/sed -e 's/foo/bar/ '
> sed: command garbled: s/foo/bar/
> % echo $?
> 2
>
> Fix this by simply removing the unnecessary space.
>
> Additionally, in 99094a7a, a trivial && breakage was fixed. This
> exposed a problem with the test when run on Solaris with xpg4/sed that
> had gone silently undetected since its introduction in
> e4bd10b2. Solaris' sed executes the requested substitution but prints
> a warning about the missing newline at the end of the file and exits
> with status 2.
>
> % echo "CHANGE_ME" | \
> tr -d "\\012" | /usr/xpg4/bin/sed -e 's/CHANGE_ME/change_me/'
> sed: Missing newline at end of file standard input.
> change_me
> % echo $?
> 2
>
> To work around this, use perl to execute the substitution instead. By
> using inplace replacement, we can subsequently drop the mv command.
>
> Signed-off-by: Ben Walton <bdwalton@gmail•com>
> ---
> t/t5601-clone.sh | 2 +-
> t/t9500-gitweb-standalone-no-errors.sh | 3 +--
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
> index fa6be3c..2583f84 100755
> --- a/t/t5601-clone.sh
> +++ b/t/t5601-clone.sh
> @@ -445,7 +445,7 @@ test_expect_success 'clone ssh://host.xz:22/~repo' '
> #IPv6
> for tuah in ::1 [::1] [::1]: user@::1 user@[::1] user@[::1]: [user@::1] [user@::1]:
> do
> - ehost=$(echo $tuah | sed -e "s/1]:/1]/ " | tr -d "\133\135")
> + ehost=$(echo $tuah | sed -e "s/1]:/1]/" | tr -d "\133\135")
Can this not be rewritten as
ehost=$(echo $tuah | sed -e "s/1]:/1]/" -e "s/[][]//g")
But I admit that it looks like black magic without a comment...
> test_expect_success "clone ssh://$tuah/home/user/repo" "
> test_clone_url ssh://$tuah/home/user/repo $ehost /home/user/repo
> "
> diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh
> index e94b2f1..eb264f9 100755
> --- a/t/t9500-gitweb-standalone-no-errors.sh
> +++ b/t/t9500-gitweb-standalone-no-errors.sh
> @@ -290,8 +290,7 @@ test_expect_success 'setup incomplete lines' '
> echo "incomplete" | tr -d "\\012" >>file &&
> git commit -a -m "Add incomplete line" &&
> git tag incomplete_lines_add &&
> - sed -e s/CHANGE_ME/change_me/ <file >file+ &&
> - mv -f file+ file &&
> + perl -pi -e "s/CHANGE_ME/change_me/" file &&
This is problematic. On Windows, perl -i fails when no backup file
extension is specified because perl attempts to replace a file that is
still open; that does not work on Windows. This should work, but I
haven't tested, yet:
perl -pi.bak -e "s/CHANGE_ME/change_me/" file &&
> git commit -a -m "Incomplete context line" &&
> git tag incomplete_lines_ctx &&
> echo "Dominus regit me," >file &&
>
-- Hannes
next prev parent reply other threads:[~2015-07-19 6:55 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-18 15:21 [PATCH 2/2] Fix sed usage in tests to work around broken xpg4/sed on Solaris Ben Walton
2015-07-19 3:39 ` Eric Sunshine
2015-07-19 6:54 ` Johannes Sixt [this message]
2015-07-19 7:37 ` Johannes Schindelin
2015-07-19 8:40 ` Johannes Sixt
2015-07-20 16:07 ` Junio C Hamano
2015-07-22 9:52 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=55AB49C1.8010105@kdbg.org \
--to=j6t@kdbg$(echo .)org \
--cc=bdwalton@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox