From: Bruno Haible <bruno@clisp.org>
Date: Sun, 30 Aug 2009 21:43:52 +0000 (+0200)
Subject: Use /usr/xpg6/bin/tr when it exists.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=486f3db6e8f550ef673d0eb73ac11906e9e631b9;p=pspp

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

diff --git a/ChangeLog b/ChangeLog
index c0d7d5c9ce..61f949aa86 100644
--- 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 a657980e0a..88404701df 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 55f4b1e443..e3ea165b66 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.