maint: remove explicit Files: tests/init.sh; depend on test-framework-sh

* modules/atexit-tests: Rather than listing tests/init.sh,
now that there's a module for it, simply depend on that new module.
* modules/closein-tests: Likewise.
* modules/exclude-tests: Likewise.
* modules/getcwd-tests: Likewise.
* modules/perror-tests: Likewise.
* modules/pread-tests: Likewise.
* modules/pwrite-tests: Likewise.
* modules/vc-list-files-tests: Likewise.
* modules/verify-tests: Likewise.
* modules/xalloc-die-tests: Likewise.
* modules/xstrtoimax-tests: Likewise.
* modules/xstrtol-tests: Likewise.
* modules/xstrtoll-tests: Likewise.
* modules/xstrtoumax-tests: Likewise.
* modules/yesno-tests: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 43336af..f65801f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2011-12-23  Jim Meyering  <meyering@redhat.com>
+
+       maint: remove explicit Files: tests/init.sh; depend on test-framework-sh
+       * modules/atexit-tests: Rather than listing tests/init.sh,
+       now that there's a module for it, simply depend on that new module.
+       * modules/closein-tests: Likewise.
+       * modules/exclude-tests: Likewise.
+       * modules/getcwd-tests: Likewise.
+       * modules/perror-tests: Likewise.
+       * modules/pread-tests: Likewise.
+       * modules/pwrite-tests: Likewise.
+       * modules/vc-list-files-tests: Likewise.
+       * modules/verify-tests: Likewise.
+       * modules/xalloc-die-tests: Likewise.
+       * modules/xstrtoimax-tests: Likewise.
+       * modules/xstrtol-tests: Likewise.
+       * modules/xstrtoll-tests: Likewise.
+       * modules/xstrtoumax-tests: Likewise.
+       * modules/yesno-tests: Likewise.
+
 2011-12-22  Jim Meyering  <meyering@redhat.com>
 
        test-framework-sh: add minimal tests of init.sh's compare function

diff --git a/modules/atexit-tests b/modules/atexit-tests
index 1d1f0d0..815fce0 100644 (file)
--- a/modules/atexit-tests
+++ b/modules/atexit-tests
@@ -1,10 +1,10 @@
 Files:
-tests/init.sh
 tests/signature.h
 tests/test-atexit.sh
 tests/test-atexit.c
 
 Depends-on:
+test-framework-sh
 unistd
 
 configure.ac:

diff --git a/modules/closein-tests b/modules/closein-tests
index 8cbf593..1cc6609 100644 (file)
--- a/modules/closein-tests
+++ b/modules/closein-tests
@@ -1,11 +1,11 @@
 Files:
-tests/init.sh
 tests/test-closein.sh
 tests/test-closein.c
 
 Depends-on:
 binary-io
 ignore-value
+test-framework-sh
 
 configure.ac:
 

diff --git a/modules/exclude-tests b/modules/exclude-tests
index 072a4e6..9900fb3 100644 (file)
--- a/modules/exclude-tests
+++ b/modules/exclude-tests
@@ -1,5 +1,4 @@
 Files:
-tests/init.sh
 tests/test-exclude.c
 tests/test-exclude1.sh
 tests/test-exclude2.sh
@@ -11,9 +10,10 @@ tests/test-exclude7.sh
 tests/test-exclude8.sh
 
 Depends-on:
-progname
-error
 argmatch
+error
+progname
+test-framework-sh
 
 Makefile.am:
 TESTS += \

diff --git a/modules/getcwd-tests b/modules/getcwd-tests
index 1cbf0fb..e5a7bd7 100644 (file)
--- a/modules/getcwd-tests
+++ b/modules/getcwd-tests
@@ -1,7 +1,6 @@
 Files:
 tests/test-getcwd.c
 tests/test-getcwd.sh
-tests/init.sh
 
 Depends-on:
 errno
@@ -9,6 +8,7 @@ fcntl-h
 getcwd-lgpl
 pathmax
 sys_stat
+test-framework-sh
 
 configure.ac:
 

diff --git a/modules/perror-tests b/modules/perror-tests
index 5e41800..016c89d 100644 (file)
--- a/modules/perror-tests
+++ b/modules/perror-tests
@@ -1,5 +1,4 @@
 Files:
-tests/init.sh
 tests/macros.h
 tests/signature.h
 tests/test-perror.c
@@ -10,6 +9,7 @@ Depends-on:
 dup2
 ftruncate
 strerror
+test-framework-sh
 
 configure.ac:
 

diff --git a/modules/pread-tests b/modules/pread-tests
index 72e4613..eead17b 100644 (file)
--- a/modules/pread-tests
+++ b/modules/pread-tests
@@ -1,11 +1,11 @@
 Files:
 tests/test-pread.c
 tests/test-pread.sh
-tests/init.sh
 tests/signature.h
 tests/macros.h
 
 Depends-on:
+test-framework-sh
 
 configure.ac:
 

diff --git a/modules/pwrite-tests b/modules/pwrite-tests
index 6249a8e..1dbdcc2 100644 (file)
--- a/modules/pwrite-tests
+++ b/modules/pwrite-tests
@@ -1,11 +1,11 @@
 Files:
 tests/test-pwrite.sh
 tests/test-pwrite.c
-tests/init.sh
 tests/signature.h
 tests/macros.h
 
 Depends-on:
+test-framework-sh
 
 configure.ac:
 

diff --git a/modules/vc-list-files-tests b/modules/vc-list-files-tests
index 368a5bf..a66a45b 100644 (file)
--- a/modules/vc-list-files-tests
+++ b/modules/vc-list-files-tests
@@ -1,9 +1,9 @@
 Files:
 tests/test-vc-list-files-git.sh
 tests/test-vc-list-files-cvs.sh
-tests/init.sh
 
 Depends-on:
+test-framework-sh
 
 configure.ac:
 abs_aux_dir=`cd "$ac_aux_dir"; pwd`

diff --git a/modules/verify-tests b/modules/verify-tests
index 936ed56..939a1ce 100644 (file)
--- a/modules/verify-tests
+++ b/modules/verify-tests
@@ -1,9 +1,9 @@
 Files:
 tests/test-verify.c
 tests/test-verify.sh
-tests/init.sh
 
 Depends-on:
+test-framework-sh
 
 configure.ac:
 

diff --git a/modules/xalloc-die-tests b/modules/xalloc-die-tests
index ca7acd2..e611f80 100644 (file)
--- a/modules/xalloc-die-tests
+++ b/modules/xalloc-die-tests
@@ -1,10 +1,10 @@
 Files:
 tests/test-xalloc-die.c
 tests/test-xalloc-die.sh
-tests/init.sh
 
 Depends-on:
 progname
+test-framework-sh
 
 Makefile.am:
 TESTS += test-xalloc-die.sh

diff --git a/modules/xstrtoimax-tests b/modules/xstrtoimax-tests
index ea8e1ba..52dd71e 100644 (file)
--- a/modules/xstrtoimax-tests
+++ b/modules/xstrtoimax-tests
@@ -1,9 +1,9 @@
 Files:
-tests/init.sh
 tests/test-xstrtoimax.c
 tests/test-xstrtoimax.sh
 
 Depends-on:
+test-framework-sh
 
 configure.ac:
 

diff --git a/modules/xstrtol-tests b/modules/xstrtol-tests
index 1fa29ab..da11c19 100644 (file)
--- a/modules/xstrtol-tests
+++ b/modules/xstrtol-tests
@@ -1,11 +1,11 @@
 Files:
-tests/init.sh
 tests/test-xstrtol.c
 tests/test-xstrtoul.c
 tests/test-xstrtol.sh
 
 Depends-on:
 inttypes
+test-framework-sh
 
 configure.ac:
 

diff --git a/modules/xstrtoll-tests b/modules/xstrtoll-tests
index bef462a..d4e24d9 100644 (file)
--- a/modules/xstrtoll-tests
+++ b/modules/xstrtoll-tests
@@ -1,5 +1,4 @@
 Files:
-tests/init.sh
 tests/test-xstrtol.c
 tests/test-xstrtoll.c
 tests/test-xstrtoull.c
@@ -7,6 +6,7 @@ tests/test-xstrtoll.sh
 
 Depends-on:
 inttypes
+test-framework-sh
 
 configure.ac:
 

diff --git a/modules/xstrtoumax-tests b/modules/xstrtoumax-tests
index 5d49c4b..83c4d1b 100644 (file)
--- a/modules/xstrtoumax-tests
+++ b/modules/xstrtoumax-tests
@@ -1,9 +1,9 @@
 Files:
-tests/init.sh
 tests/test-xstrtoumax.c
 tests/test-xstrtoumax.sh
 
 Depends-on:
+test-framework-sh
 
 configure.ac:
 

diff --git a/modules/yesno-tests b/modules/yesno-tests
index 3e1e0a2..4582cef 100644 (file)
--- a/modules/yesno-tests
+++ b/modules/yesno-tests
@@ -1,11 +1,11 @@
 Files:
-tests/init.sh
 tests/test-yesno.c
 tests/test-yesno.sh
 
 Depends-on:
-closein
 binary-io
+closein
+test-framework-sh
 
 configure.ac: