tests: more faithful 'installcheck' support in few tests

* tests/test-driver-acsubst.test: Use the `$am_scriptdir'
variable instead of `$testsrcdir/../lib', to test more
faithfully under "make installcheck".
* tests/test-driver-cond.test: Likewise.
* tests/dist-auxfile.test: Likewise, and add one more use
of `fatal_' to report hard errors.
* tests/tests/dist-auxdir-many-subdirs.test: Likewise.

5 files changed, 19 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 2971556b5..b96e994b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2011-10-21  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
+	tests: more faithful 'installcheck' support in few tests
+	* tests/test-driver-acsubst.test: Use the `$am_scriptdir'
+	variable instead of `$testsrcdir/../lib', to test more
+	faithfully under "make installcheck".
+	* tests/test-driver-cond.test: Likewise.
+	* tests/dist-auxfile.test: Likewise, and add one more use
+	of `fatal_' to report hard errors.
+	* tests/tests/dist-auxdir-many-subdirs.test: Likewise.
+
+2011-10-21  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
 	tests: remove redundant settings of `errexit' shell flag
 	* tests/aclocal-path-install-serial.test: Do not set the
 	`errexit' shell flag, as it is already set by `tests/defs'.
diff --git a/tests/dist-auxdir-many-subdirs.test b/tests/dist-auxdir-many-subdirs.test
index 2fd9ff11b..6078f04eb 100755
--- a/tests/dist-auxdir-many-subdirs.test
+++ b/tests/dist-auxdir-many-subdirs.test
@@ -89,9 +89,8 @@ END
   $ACLOCAL
   $AUTOCONF
 
-  # FIXME: this is not good for installcheck; fix after merging
-  # into testsuite-work.
-  "$top_testsrcdir"/lib/install-sh -d $auxdir
+  "$am_scriptdir"/install-sh -d $auxdir \
+    || fatal_ "creating directory \`$auxdir' with install-sh"
   if test $add_missing = yes; then
     $AUTOMAKE -a --copy
     for f in $required_files; do
@@ -103,9 +102,8 @@ END
     done
   else
     for f in $required_files; do
-      # FIXME: this is not good for installcheck; fix after merging
-      # into testsuite-work.
-      cp "$top_testsrcdir"/lib/$f $auxdir/$f
+      cp "$am_scriptdir"/$f $auxdir/$f \
+        || fatal_ "faild to fetch auxiliary script \`$f'"
       # See comments above.
       chmod a-w $auxdir/$f
     done
diff --git a/tests/dist-auxfile.test b/tests/dist-auxfile.test
index 91b09e994..d04b6c9a6 100755
--- a/tests/dist-auxfile.test
+++ b/tests/dist-auxfile.test
@@ -79,7 +79,8 @@ END
   grep "^configure\\.in:6:.* required file.*$auxdir_rx/zardoz"    stderr
 
   touch $auxdir/foo.txt $auxdir/bar.sh $auxdir/zardoz
-  cp "$testsrcdir"/../lib/missing "$testsrcdir"/../lib/install-sh $auxdir
+  cp "$am_scriptdir"/missing "$am_scriptdir"/install-sh $auxdir \
+    || fatal_ "fetching auxiliary scripts \`missing' and \`install-sh'"
   $AUTOMAKE
   ./configure
   $MAKE test
diff --git a/tests/test-driver-acsubst.test b/tests/test-driver-acsubst.test
index 3e34f47d0..9c29ac9cc 100755
--- a/tests/test-driver-acsubst.test
+++ b/tests/test-driver-acsubst.test
@@ -24,8 +24,7 @@ mkdir test-drivers
 
 cp "$testsrcdir"/trivial-test-driver test-drivers/triv \
   || fatal_ "failed to fetch auxiliary script trivial-test-driver"
-# FIXME: better support for installcheck ...
-cp "$top_testsrcdir"/lib/test-driver test-drivers/dflt \
+cp "$am_scriptdir"/test-driver test-drivers/dflt \
   || fatal_ "failed to fetch auxiliary script test-driver"
 
 cat >> configure.in <<'END'
diff --git a/tests/test-driver-cond.test b/tests/test-driver-cond.test
index 006a9e2fd..3ed48a97b 100755
--- a/tests/test-driver-cond.test
+++ b/tests/test-driver-cond.test
@@ -23,8 +23,7 @@ am_parallel_tests=yes
 
 cp "$testsrcdir"/trivial-test-driver . \
   || fatal_ "failed to fetch auxiliary script trivial-test-driver"
-# FIXME: better support for installcheck ...
-cp "$top_testsrcdir"/lib/tap-driver.pl . \
+cp "$am_scriptdir"/tap-driver.pl . \
   || fatal_ "failed to fetch auxiliary script tap-driver.pl"
 
 cat >> configure.in << END