X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-xstrtoumax.sh;h=12a7ba9f60b856b0bde1e71ec362f29042cc786f;hb=1b22ddf54eb25f38d049c46e4b5d7323b15d8ecf;hp=c86c9fbfcaf6c6bb3bbf2ba0ab9a62f5d7066b1d;hpb=97c5de22902af85f150ed825b8ce5df94197e9bc;p=gnulib.git

diff --git a/tests/test-xstrtoumax.sh b/tests/test-xstrtoumax.sh
index c86c9fbfc..12a7ba9f6 100755
--- a/tests/test-xstrtoumax.sh
+++ b/tests/test-xstrtoumax.sh
@@ -19,8 +19,16 @@ result=0
 ./test-xstrtoumax${EXEEXT} 010 >> t-xstrtoumax.tmp 2>&1 || result=1
 ./test-xstrtoumax${EXEEXT} MiB >> t-xstrtoumax.tmp 2>&1 || result=1
 
+# Find out how to remove carriage returns from output. Solaris /usr/ucb/tr
+# does not understand '\r'.
+if echo solaris | tr -d '\r' | grep solais > /dev/null; then
+  cr='\015'
+else
+  cr='\r'
+fi
+
 # normalize output
-LC_ALL=C tr -d '\r' < t-xstrtoumax.tmp > t-xstrtoumax.xo
+LC_ALL=C tr -d "$cr" < t-xstrtoumax.tmp > t-xstrtoumax.xo
 mv t-xstrtoumax.xo t-xstrtoumax.tmp
 
 # compare expected output