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

diff --git a/ChangeLog b/ChangeLog
index c0d7d5c..61f949a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 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.
        * 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 a657980..8840470 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 55f4b1e..e3ea165 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.