X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-xstrtol.sh;h=1a2f7ca90fe0732bdd81cde298625aa79dc56bf0;hb=3b905e0ad791b750d0a471c90ecaacf2345a39c3;hp=7bf883379bea142f336a3d504497e32b000c2b7e;hpb=c7110f3b833159c91e8cbe6a14349174aeef4ab6;p=gnulib.git

diff --git a/tests/test-xstrtol.sh b/tests/test-xstrtol.sh
index 7bf883379..1a2f7ca90 100755
--- a/tests/test-xstrtol.sh
+++ b/tests/test-xstrtol.sh
@@ -1,64 +1,67 @@
 #!/bin/sh
+: ${srcdir=.}
+. "$srcdir/init.sh"; path_prepend_ .
 
-tmpfiles=""
-trap 'rm -fr $tmpfiles' 1 2 3 15
-
-tmpfiles="t-xstrtol.tmp t-xstrtol.xo"
-: > t-xstrtol.tmp
 too_big=99999999999999999999999999999999999999999999999999999999999999999999
 result=0
 
 # test xstrtol
-./test-xstrtol${EXEEXT} 1 >> t-xstrtol.tmp 2>&1 || result=1
-./test-xstrtol${EXEEXT} -1 >> t-xstrtol.tmp 2>&1 || result=1
-./test-xstrtol${EXEEXT} 1k >> t-xstrtol.tmp 2>&1 || result=1
-./test-xstrtol${EXEEXT} ${too_big}h >> t-xstrtol.tmp 2>&1 && result=1
-./test-xstrtol${EXEEXT} $too_big >> t-xstrtol.tmp 2>&1 && result=1
-./test-xstrtol${EXEEXT} x >> t-xstrtol.tmp 2>&1 && result=1
-./test-xstrtol${EXEEXT} 9x >> t-xstrtol.tmp 2>&1 && result=1
-./test-xstrtol${EXEEXT} 010 >> t-xstrtol.tmp 2>&1 || result=1
+test-xstrtol 1 >> out 2>&1 || result=1
+test-xstrtol -1 >> out 2>&1 || result=1
+test-xstrtol 1k >> out 2>&1 || result=1
+test-xstrtol ${too_big}h >> out 2>&1 && result=1
+test-xstrtol $too_big >> out 2>&1 && result=1
+test-xstrtol x >> out 2>&1 && result=1
+test-xstrtol 9x >> out 2>&1 && result=1
+test-xstrtol 010 >> out 2>&1 || result=1
 # suffix without integer is valid
-./test-xstrtol${EXEEXT} MiB >> t-xstrtol.tmp 2>&1 || result=1
+test-xstrtol MiB >> out 2>&1 || result=1
 
 # test xstrtoul
-./test-xstrtoul${EXEEXT} 1 >> t-xstrtol.tmp 2>&1 || result=1
-./test-xstrtoul${EXEEXT} -1 >> t-xstrtol.tmp 2>&1 && result=1
-./test-xstrtoul${EXEEXT} 1k >> t-xstrtol.tmp 2>&1 || result=1
-./test-xstrtoul${EXEEXT} ${too_big}h >> t-xstrtol.tmp 2>&1 && result=1
-./test-xstrtoul${EXEEXT} $too_big >> t-xstrtol.tmp 2>&1 && result=1
-./test-xstrtoul${EXEEXT} x >> t-xstrtol.tmp 2>&1 && result=1
-./test-xstrtoul${EXEEXT} 9x >> t-xstrtol.tmp 2>&1 && result=1
-./test-xstrtoul${EXEEXT} 010 >> t-xstrtol.tmp 2>&1 || result=1
-./test-xstrtoul${EXEEXT} MiB >> t-xstrtol.tmp 2>&1 || result=1
+test-xstrtoul 1 >> out 2>&1 || result=1
+test-xstrtoul -1 >> out 2>&1 && result=1
+test-xstrtoul 1k >> out 2>&1 || result=1
+test-xstrtoul ${too_big}h >> out 2>&1 && result=1
+test-xstrtoul $too_big >> out 2>&1 && result=1
+test-xstrtoul x >> out 2>&1 && result=1
+test-xstrtoul 9x >> out 2>&1 && result=1
+test-xstrtoul 010 >> out 2>&1 || result=1
+test-xstrtoul 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-xstrtol.tmp > t-xstrtol.xo
-mv t-xstrtol.xo t-xstrtol.tmp
+LC_ALL=C tr -d "$cr" < out > k
+mv k out
 
 # compare expected output
-cat > t-xstrtol.xo <<EOF
+cat > expected <<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 ()
 1->1 ()
-invalid arg argument \`-1'
+invalid X argument \`-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-xstrtol.xo t-xstrtol.tmp || result=1
-
-rm -fr $tmpfiles
+compare expected out || result=1
 
-exit $result
+Exit $result