From 486f3db6e8f550ef673d0eb73ac11906e9e631b9 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 30 Aug 2009 23:43:52 +0200 Subject: [PATCH] Use /usr/xpg6/bin/tr when it exists. --- ChangeLog | 6 ++++++ tests/test-pipe-filter-gi1.sh | 10 +++++++--- tests/test-pipe-filter-ii1.sh | 10 +++++++--- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index c0d7d5c9c..61f949aa8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2009-08-30 Bruno Haible + * tests/test-pipe-filter-ii1.sh: Prefer /usr/xpg6/bin/tr over + /usr/xpg4/bin/tr when it exists. + * tests/test-pipe-filter-gi1.sh: Likewise. + +2009-08-30 Bruno Haible + Work around deficient /usr/bin/id program on Solaris. * tests/test-file-has-acl.sh (ID): New variable. * tests/test-set-mode-acl.sh (ID): Likewise. diff --git a/tests/test-pipe-filter-gi1.sh b/tests/test-pipe-filter-gi1.sh index a657980e0..88404701d 100755 --- a/tests/test-pipe-filter-gi1.sh +++ b/tests/test-pipe-filter-gi1.sh @@ -2,10 +2,14 @@ # Find a 'tr' program that supports character ranges in the POSIX syntax. # Solaris /usr/bin/tr does not. -if test -f /usr/xpg4/bin/tr; then - TR=/usr/xpg4/bin/tr +if test -f /usr/xpg6/bin/tr; then + TR=/usr/xpg6/bin/tr else - TR=tr + if test -f /usr/xpg4/bin/tr; then + TR=/usr/xpg4/bin/tr + else + TR=tr + fi fi # A small file. diff --git a/tests/test-pipe-filter-ii1.sh b/tests/test-pipe-filter-ii1.sh index 55f4b1e44..e3ea165b6 100755 --- a/tests/test-pipe-filter-ii1.sh +++ b/tests/test-pipe-filter-ii1.sh @@ -2,10 +2,14 @@ # Find a 'tr' program that supports character ranges in the POSIX syntax. # Solaris /usr/bin/tr does not. -if test -f /usr/xpg4/bin/tr; then - TR=/usr/xpg4/bin/tr +if test -f /usr/xpg6/bin/tr; then + TR=/usr/xpg6/bin/tr else - TR=tr + if test -f /usr/xpg4/bin/tr; then + TR=/usr/xpg4/bin/tr + else + TR=tr + fi fi # A small file. -- 2.11.0