X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-xstrtol.sh;h=f718d8f77987574df0f94a0114f7be11a9a7c516;hb=b1098d3defbaf285f3ed8eff414fa43ffc59d6a2;hp=c56c6750003e4d13461ea13a20ec66743b5a3a82;hpb=3911e72f350db41219cae293f0ef90eb3d9361eb;p=gnulib.git

diff --git a/tests/test-xstrtol.sh b/tests/test-xstrtol.sh
index c56c67500..f718d8f77 100755
--- a/tests/test-xstrtol.sh
+++ b/tests/test-xstrtol.sh
@@ -1,35 +1,32 @@
 #!/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'.
@@ -40,33 +37,31 @@ else
 fi
 
 # normalize output
-LC_ALL=C tr -d "$cr" < 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 X argument \`${too_big}h'
-X argument \`$too_big' too large
-invalid X argument \`x'
-invalid suffix in X 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 X argument \`-1'
+invalid X argument '-1'
 1k->1024 ()
-invalid suffix in X argument \`${too_big}h'
-X argument \`$too_big' too large
-invalid X argument \`x'
-invalid suffix in X 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