X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-xstrtoumax.sh;h=68abb93cb8684697b316c1472bef9de32280676d;hb=91fd3b18b755b77c4bb3f7556ddedb055c16c834;hp=12a7ba9f60b856b0bde1e71ec362f29042cc786f;hpb=3911e72f350db41219cae293f0ef90eb3d9361eb;p=gnulib.git

diff --git a/tests/test-xstrtoumax.sh b/tests/test-xstrtoumax.sh
index 12a7ba9f6..68abb93cb 100755
--- a/tests/test-xstrtoumax.sh
+++ b/tests/test-xstrtoumax.sh
@@ -1,23 +1,20 @@
 #!/bin/sh
+: ${srcdir=.}
+. "$srcdir/init.sh"; path_prepend_ .
 
-tmpfiles=""
-trap 'rm -fr $tmpfiles' 1 2 3 15
-
-tmpfiles="t-xstrtoumax.tmp t-xstrtoumax.xo"
-: > t-xstrtoumax.tmp
 too_big=99999999999999999999999999999999999999999999999999999999999999999999
 result=0
 
 # test xstrtoumax
-./test-xstrtoumax${EXEEXT} 1 >> t-xstrtoumax.tmp 2>&1 || result=1
-./test-xstrtoumax${EXEEXT} -1 >> t-xstrtoumax.tmp 2>&1 && result=1
-./test-xstrtoumax${EXEEXT} 1k >> t-xstrtoumax.tmp 2>&1 || result=1
-./test-xstrtoumax${EXEEXT} ${too_big}h >> t-xstrtoumax.tmp 2>&1 && result=1
-./test-xstrtoumax${EXEEXT} $too_big >> t-xstrtoumax.tmp 2>&1 && result=1
-./test-xstrtoumax${EXEEXT} x >> t-xstrtoumax.tmp 2>&1 && result=1
-./test-xstrtoumax${EXEEXT} 9x >> t-xstrtoumax.tmp 2>&1 && result=1
-./test-xstrtoumax${EXEEXT} 010 >> t-xstrtoumax.tmp 2>&1 || result=1
-./test-xstrtoumax${EXEEXT} MiB >> t-xstrtoumax.tmp 2>&1 || result=1
+test-xstrtoumax 1 >> out 2>&1 || result=1
+test-xstrtoumax -1 >> out 2>&1 && result=1
+test-xstrtoumax 1k >> out 2>&1 || result=1
+test-xstrtoumax ${too_big}h >> out 2>&1 && result=1
+test-xstrtoumax $too_big >> out 2>&1 && result=1
+test-xstrtoumax x >> out 2>&1 && result=1
+test-xstrtoumax 9x >> out 2>&1 && result=1
+test-xstrtoumax 010 >> out 2>&1 || result=1
+test-xstrtoumax MiB >> out 2>&1 || result=1
 
 # Find out how to remove carriage returns from output. Solaris /usr/ucb/tr
 # does not understand '\r'.
@@ -28,11 +25,11 @@ else
 fi
 
 # normalize output
-LC_ALL=C tr -d "$cr" < t-xstrtoumax.tmp > t-xstrtoumax.xo
-mv t-xstrtoumax.xo t-xstrtoumax.tmp
+LC_ALL=C tr -d "$cr" < out > k
+mv k out
 
 # compare expected output
-cat > t-xstrtoumax.xo <<EOF
+cat > exp <<EOF
 1->1 ()
 invalid X argument \`-1'
 1k->1024 ()
@@ -44,8 +41,6 @@ invalid suffix in X argument \`9x'
 MiB->1048576 ()
 EOF
 
-diff t-xstrtoumax.xo t-xstrtoumax.tmp || result=1
-
-rm -fr $tmpfiles
+compare exp out || result=1
 
-exit $result
+Exit $result