Use /usr/xpg6/bin/tr when it exists.

diff --git a/ChangeLog b/ChangeLog
index c0d7d5c9cebff2af92f659458fce8830c23ea7d7..61f949aa86290973a7bab64777b7282936accdf7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-30  Bruno Haible  <bruno@clisp.org>
+
+       * 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  <bruno@clisp.org>
 
        Work around deficient /usr/bin/id program on Solaris.

diff --git a/tests/test-pipe-filter-gi1.sh b/tests/test-pipe-filter-gi1.sh
index a657980e0a2ffdf6be5030b70129bac557e664db..88404701dfe64cb44e6c30426a7efcb6ec07ae9f 100755 (executable)
--- 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 55f4b1e443ee71597af79722d2106d9be84282e2..e3ea165b66ae5cb0b20411487546b00123f6b64b 100755 (executable)
--- 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.