X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftest-xstrtoumax.sh;h=12a7ba9f60b856b0bde1e71ec362f29042cc786f;hb=45df4e51c11ef82a30eb6f8dc0e82323e3882eaa;hp=f37dd9ae615e03dc507eed02fcb4275910ed192e;hpb=50236f7a99ae6442f6235451da1e345ca0fe7b18;p=gnulib.git

diff --git a/tests/test-xstrtoumax.sh b/tests/test-xstrtoumax.sh
index f37dd9ae6..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
-sed -e 's/^[^:]*: //' < 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