From: Ben Walton <bdwalton@gmail.com>
To: gitster@pobox.com, git@vger.kernel.org
Cc: Ben Walton <bdwalton@gmail.com>
Subject: [PATCH] Avoid broken Solaris tr
Date: Tue, 18 Jun 2013 22:17:27 +0100 [thread overview]
Message-ID: <1371590247-13436-1-git-send-email-bdwalton@gmail.com> (raw)
Solaris' tr (both /usr/bin/ and /usr/xpg4/bin) fail to handle the case
where the first argument is a multi-character set and the second is a
single null character. Use perl to perform these substitutions
instead. Now that we're using perl for the transliteration, we might
as well replace the sed invocations with it too.
We make this change globally in t0008-ignores instead of just for the
cases where it matters in order to maintain consistency.
Signed-off-by: Ben Walton <bdwalton@gmail.com>
---
t/t0008-ignores.sh | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh
index a56db80..9e4987e 100755
--- a/t/t0008-ignores.sh
+++ b/t/t0008-ignores.sh
@@ -552,12 +552,13 @@ cat <<-EOF >expected-verbose
$global_excludes:2:!globaltwo b/globaltwo
EOF
-sed -e 's/^"//' -e 's/\\//' -e 's/"$//' stdin | \
- tr "\n" "\0" >stdin0
-sed -e 's/^"//' -e 's/\\//' -e 's/"$//' expected-default | \
- tr "\n" "\0" >expected-default0
-sed -e 's/ "/ /' -e 's/\\//' -e 's/"$//' expected-verbose | \
- tr ":\t\n" "\0" >expected-verbose0
+perl -pne 's/^"//; s/\\//; s/"$//; s/\n/\0/g' stdin >stdin0
+
+perl -pne 's/^"//; s/\\//; s/"$//; s/\n/\0/g' expected-default > \
+ expected-default0
+
+perl -pne 's/ "/ /; s/\\//; s/"$//; s/[:\t\n]/\0/g' expected-verbose > \
+ expected-verbose0
test_expect_success '--stdin' '
expect_from_stdin <expected-default &&
@@ -638,12 +639,13 @@ EOF
grep -v '^:: ' expected-all >expected-verbose
sed -e 's/.* //' expected-verbose >expected-default
-sed -e 's/^"//' -e 's/\\//' -e 's/"$//' stdin | \
- tr "\n" "\0" >stdin0
-sed -e 's/^"//' -e 's/\\//' -e 's/"$//' expected-default | \
- tr "\n" "\0" >expected-default0
-sed -e 's/ "/ /' -e 's/\\//' -e 's/"$//' expected-verbose | \
- tr ":\t\n" "\0" >expected-verbose0
+perl -pne 's/^"//; s/\\//; s/"$//; s/\n/\0/g' stdin >stdin0
+
+perl -pne 's/^"//; s/\\//; s/"$//; s/\n/\0/g' expected-default > \
+ expected-default0
+
+perl -pne 's/ "/ /; s/\\//; s/"$//; s/[:\t\n]/\0/g' expected-verbose > \
+ expected-verbose0
test_expect_success '--stdin from subdirectory' '
expect_from_stdin <expected-default &&
--
1.8.1.2
next reply other threads:[~2013-06-18 21:40 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-18 21:17 Ben Walton [this message]
2013-06-18 22:31 ` [PATCH] Avoid broken Solaris tr Junio C Hamano
2013-10-28 9:02 ` Ben Walton
2013-10-28 9:13 ` [PATCH] Avoid difference in tr semantics between System V and BSD Ben Walton
2013-10-28 18:07 ` Johannes Sixt
2013-10-28 18:27 ` Jonathan Nieder
2013-10-28 19:08 ` Junio C Hamano
2013-10-28 19:22 ` [PATCH] t/README: tests can use perl even with NO_PERL Jonathan Nieder
2013-10-28 19:46 ` Johannes Sixt
2013-10-28 19:54 ` Jeff King
2013-10-28 21:04 ` Jonathan Nieder
2013-10-28 21:43 ` Ben Walton
2013-10-29 1:18 ` [RFC/PATCH 0/3] perl Jeff King
2013-10-29 1:19 ` [PATCH 1/3] use @@PERL@@ in built scripts Jeff King
2013-10-29 19:41 ` Junio C Hamano
2013-10-29 1:22 ` [PATCH 2/3] t: provide a perl() function which uses $PERL_PATH Jeff King
2013-10-29 1:23 ` [PATCH 3/3] t: use perl instead of "$PERL_PATH" where applicable Jeff King
2013-10-28 21:04 ` [PATCH] Avoid difference in tr semantics between System V and BSD Ben Walton
2013-10-28 21:12 ` Ben Walton
2013-10-28 21:30 ` Junio C Hamano
2013-10-28 21:40 ` Ben Walton
2013-10-28 21:43 ` Ben Walton
2013-10-28 21:43 ` Ben Walton
2013-10-30 17:39 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1371590247-13436-1-git-send-email-bdwalton@gmail.com \
--to=bdwalton@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).