--- a/ChangeLog	Tue May 24 16:54:17 2011 -0600
+++ b/ChangeLog	Tue May 24 17:16:00 2011 -0600
@@ -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.

--- a/modules/closein-tests	Tue May 24 16:54:17 2011 -0600
+++ b/modules/closein-tests	Tue May 24 17:16:00 2011 -0600
@@ -1,4 +1,5 @@
 Files:
+tests/init.sh
 tests/test-closein.sh
 tests/test-closein.c
 

--- a/tests/test-closein.sh	Tue May 24 16:54:17 2011 -0600
+++ b/tests/test-closein.sh	Tue May 24 17:16:00 2011 -0600
@@ -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 > in.tmp
+echo world > xout.tmp
 
-echo Hello world > ${p}in.tmp
-echo world > ${p}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
+test-closein consume close <&- 2>/dev/null && fail=1
 
-# Cleanup
-rm -fr $tmpfiles
-
-exit 0
+Exit $fail