Mercurial > hg > octave-nkf > gnulib-hg
changeset 13173:1e97362a0b84
xstrtoimax-tests: convert to use init.sh
* modules/xstrtoimax-tests (Files): Add tests/init.sh.
* tests/test-xstrtoimax.sh: Invoke "$srcdir/init.sh" and path_prepend_.
Use Exit, not exit.
Remove uses of $EXEEXT and "./" to run a program in the current dir.
author | Jim Meyering <meyering@redhat.com> |
---|---|
date | Mon, 05 Apr 2010 18:27:15 +0200 |
parents | 81fa67f8ef24 |
children | 371266bf04b6 |
files | ChangeLog modules/xstrtoimax-tests tests/test-xstrtoimax.sh |
diffstat | 3 files changed, 25 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2010-04-05 Jim Meyering <meyering@redhat.com> + + xstrtoimax-tests: convert to use init.sh + * modules/xstrtoimax-tests (Files): Add tests/init.sh. + * tests/test-xstrtoimax.sh: Invoke "$srcdir/init.sh" and path_prepend_. + Use Exit, not exit. + Remove uses of $EXEEXT and "./" to run a program in the current dir. + 2010-04-05 Bruno Haible <bruno@clisp.org> sys_socket: Avoid #define replacements in C++ mode.
--- a/modules/xstrtoimax-tests +++ b/modules/xstrtoimax-tests @@ -1,4 +1,5 @@ Files: +tests/init.sh tests/test-xstrtoimax.c tests/test-xstrtoimax.sh
--- a/tests/test-xstrtoimax.sh +++ b/tests/test-xstrtoimax.sh @@ -1,23 +1,20 @@ #!/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'. @@ -28,11 +25,11 @@ fi # normalize output -LC_ALL=C tr -d "$cr" < 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 () @@ -44,8 +41,6 @@ MiB->1048576 () EOF -diff t-xstrtoimax.xo t-xstrtoimax.tmp || result=1 +compare exp out || result=1 -rm -fr $tmpfiles - -exit $result +Exit $result