closein-tests: convert to init.sh

* modules/closein-tests (Files): Add init.sh
* tests/test-closein.sh Use it.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index db85276823e318ffcb556a0321fe4e1bbd2b3034..6ac14e867a58f5d82a978f24648eb2fa21409831 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-05-24  Eric Blake  <eblake@redhat.com>
 
+       closein-tests: convert to init.sh
+       * modules/closein-tests (Files): Add init.sh
+       * tests/test-closein.sh Use it.
+
        yesno-tests: convert to init.sh
        * modules/yesno-tests (Files): Add init.sh.
        * tests/test-yesno.sh: Use it.

diff --git a/modules/closein-tests b/modules/closein-tests
index 2f3f6894fe337b5457d49b359a619ac81f4053f5..8cbf593a6383cdacf45205977c2beecebf9f282a 100644 (file)
--- a/modules/closein-tests
+++ b/modules/closein-tests
@@ -1,4 +1,5 @@
 Files:
+tests/init.sh
 tests/test-closein.sh
 tests/test-closein.c
 

diff --git a/tests/test-closein.sh b/tests/test-closein.sh
index a75929a20482a5bab82574d338c04e483a080870..27b792969ca7bab91cfa1fbc08f6e557483eb027 100755 (executable)
--- a/tests/test-closein.sh
+++ b/tests/test-closein.sh
@@ -1,38 +1,32 @@
 #!/bin/sh
+: ${srcdir=.}
+. "$srcdir/init.sh"; path_prepend_ .
 
-tmpfiles=
-trap 'rm -fr $tmpfiles' 1 2 3 15
-
-p=t-closein-
-tmpfiles="${p}in.tmp ${p}xout.tmp ${p}out1.tmp ${p}out2.tmp"
-
-echo Hello world > ${p}in.tmp
-echo world > ${p}xout.tmp
+echo Hello world > in.tmp
+echo world > xout.tmp
 
+fail=0
 # Test with seekable stdin; followon process must see remaining data
-(./test-closein${EXEEXT}; cat) < ${p}in.tmp > ${p}out1.tmp || exit 1
-cmp ${p}out1.tmp ${p}in.tmp || exit 1
+(test-closein; cat) < in.tmp > out1.tmp || fail=1
+cmp out1.tmp in.tmp || fail=1
 
-(./test-closein${EXEEXT} consume; cat) < ${p}in.tmp > ${p}out2.tmp || exit 1
-cmp ${p}out2.tmp ${p}xout.tmp || exit 1
+(test-closein consume; cat) < in.tmp > out2.tmp || fail=1
+cmp out2.tmp xout.tmp || fail=1
 
 # Test for lack of error on pipe.  Ignore any EPIPE failures from cat.
-cat ${p}in.tmp 2>/dev/null | ./test-closein${EXEEXT} || exit 1
+cat in.tmp 2>/dev/null | test-closein || fail=1
 
-cat ${p}in.tmp 2>/dev/null | ./test-closein${EXEEXT} consume || exit 1
+cat in.tmp 2>/dev/null | test-closein consume || fail=1
 
 # Test for lack of error when nothing is read
-./test-closein${EXEEXT} </dev/null || exit 1
+test-closein </dev/null || fail=1
 
-./test-closein${EXEEXT} <&- || exit 1
+test-closein <&- || fail=1
 
 # Test for no error when EOF is read early
-./test-closein${EXEEXT} consume </dev/null || exit 1
+test-closein consume </dev/null || fail=1
 
 # Test for error when read fails because no file available
-./test-closein${EXEEXT} consume close <&- 2>/dev/null && exit 1
-
-# Cleanup
-rm -fr $tmpfiles
+test-closein consume close <&- 2>/dev/null && fail=1
 
-exit 0
+Exit $fail