--- a/ChangeLog
+++ b/ChangeLog
@@ -97,6 +97,12 @@
 
 2010-04-05  Jim Meyering  <meyering@redhat.com>
 
+	atexit-tests: convert to use init.sh
+	* modules/atexit-tests (Files): Add tests/init.sh.
+	* tests/test-atexit.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.
+
 	init.sh: fix typo
 	* tests/init.sh: Restore omitted ":" before stderr_fileno_ initialization.
 

--- a/modules/atexit-tests
+++ b/modules/atexit-tests
@@ -1,4 +1,5 @@
 Files:
+tests/init.sh
 tests/signature.h
 tests/test-atexit.sh
 tests/test-atexit.c

--- a/tests/test-atexit.sh
+++ b/tests/test-atexit.sh
@@ -1,32 +1,28 @@
 #!/bin/sh
+: ${srcdir=.}
+. "$srcdir/init.sh"; path_prepend_ .
 
-tmpfiles=""
-trap 'rm -fr $tmpfiles' 1 2 3 15
-
-tmpfiles="$tmpfiles t-atexit.tmp"
 # Check that an atexit handler is called when main() returns normally.
 echo > t-atexit.tmp
-./test-atexit${EXEEXT}
+test-atexit
 if test -f t-atexit.tmp; then
-  exit 1
+  Exit 1
 fi
 
 # Check that an atexit handler is called when the program is left
 # through exit(0).
 echo > t-atexit.tmp
-./test-atexit${EXEEXT} 0
+test-atexit 0
 if test -f t-atexit.tmp; then
-  exit 1
+  Exit 1
 fi
 
 # Check that an atexit handler is called when the program is left
 # through exit(1).
 echo > t-atexit.tmp
-./test-atexit${EXEEXT} 1
+test-atexit 1
 if test -f t-atexit.tmp; then
-  exit 1
+  Exit 1
 fi
 
-rm -fr $tmpfiles
-
 exit 0