X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftest-xstrtoimax.sh;h=3a0f9d252e056ed2517fec5e98db6e8aff788764;hb=a363f4ed4a0e69187c97686ac44502c49c7f4b3d;hp=d053751c5051963a918d9ed2452c651a7c766617;hpb=c7110f3b833159c91e8cbe6a14349174aeef4ab6;p=gnulib.git

diff --git a/tests/test-xstrtoimax.sh b/tests/test-xstrtoimax.sh
index d053751c5..3a0f9d252 100755
--- a/tests/test-xstrtoimax.sh
+++ b/tests/test-xstrtoimax.sh
@@ -1,43 +1,46 @@
 #!/bin/sh
+: ${srcdir=.}
+. "$srcdir/init.sh"; path_prepend_ .
 
-tmpfiles=""
-trap 'rm -fr $tmpfiles' 1 2 3 15
-
-tmpfiles="t-xstrtoimax.tmp t-xstrtoimax.xo"
-: > t-xstrtoimax.tmp
 too_big=99999999999999999999999999999999999999999999999999999999999999999999
 result=0
 
 # test xstrtoimax
-./test-xstrtoimax${EXEEXT} 1 >> t-xstrtoimax.tmp 2>&1 || result=1
-./test-xstrtoimax${EXEEXT} -1 >> t-xstrtoimax.tmp 2>&1 || result=1
-./test-xstrtoimax${EXEEXT} 1k >> t-xstrtoimax.tmp 2>&1 || result=1
-./test-xstrtoimax${EXEEXT} ${too_big}h >> t-xstrtoimax.tmp 2>&1 && result=1
-./test-xstrtoimax${EXEEXT} $too_big >> t-xstrtoimax.tmp 2>&1 && result=1
-./test-xstrtoimax${EXEEXT} x >> t-xstrtoimax.tmp 2>&1 && result=1
-./test-xstrtoimax${EXEEXT} 9x >> t-xstrtoimax.tmp 2>&1 && result=1
-./test-xstrtoimax${EXEEXT} 010 >> t-xstrtoimax.tmp 2>&1 || result=1
-./test-xstrtoimax${EXEEXT} MiB >> t-xstrtoimax.tmp 2>&1 || result=1
+test-xstrtoimax 1 >> out 2>&1 || result=1
+test-xstrtoimax -1 >> out 2>&1 || result=1
+test-xstrtoimax 1k >> out 2>&1 || result=1
+test-xstrtoimax ${too_big}h >> out 2>&1 && result=1
+test-xstrtoimax $too_big >> out 2>&1 && result=1
+test-xstrtoimax x >> out 2>&1 && result=1
+test-xstrtoimax 9x >> out 2>&1 && result=1
+test-xstrtoimax 010 >> out 2>&1 || result=1
+test-xstrtoimax MiB >> out 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-xstrtoimax.tmp > t-xstrtoimax.xo
-mv t-xstrtoimax.xo t-xstrtoimax.tmp
+LC_ALL=C tr -d "$cr" < out > k
+mv k out
 
 # compare expected output
-cat > t-xstrtoimax.xo <<EOF
+cat > exp <<EOF
 1->1 ()
 -1->-1 ()
 1k->1024 ()
-invalid suffix in arg argument \`${too_big}h'
-arg argument \`$too_big' too large
-invalid arg argument \`x'
-invalid suffix in arg argument \`9x'
+invalid suffix in X argument '${too_big}h'
+X argument '$too_big' too large
+invalid X argument 'x'
+invalid suffix in X argument '9x'
 010->8 ()
 MiB->1048576 ()
 EOF
 
-diff t-xstrtoimax.xo t-xstrtoimax.tmp || result=1
-
-rm -fr $tmpfiles
+compare exp out || result=1
 
-exit $result
+Exit $result