tests: few minor fixlets, improvements and tweakings

* tests/defs-static.in ($top_testbuilddir): New, for consistency
and completeness.
* tests/Makefile.am (do_subst): Substitute @abs_top_testbuilddir@
as well.
* tests/java-compile-run-mested.test: Prefer AM_TESTS_ENVIRONMENT
over TESTS_ENVIRONMENT, now that the former has become available.
* tests/java-compile-run-flat.test: Correct a botched "FIXME"
comment.
* tests/tap-realtime.test: Remove extra whitespace in comments.
* tests/missing-tar.test: Use `get_shell_script' to bring in the
`missing' script, to increase coverage.  Remove redundant call to
`set -e'.  Fix a typo in comments.
* tests/get-sysconf.test: Remove redundant definitions of
`$top_testsrcdir', `testbuilddir' and `$top_testbuilddir'.

7 files changed, 9 insertions, 17 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 25de9a432..32824ffd6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -119,6 +119,7 @@ do_subst = sed \
   -e 's|@abs_srcdir[@]|$(abs_srcdir)|g' \
   -e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \
   -e 's|@abs_builddir[@]|$(abs_builddir)|g' \
+  -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \
   -e 's|@prefix[@]|$(prefix)|g' \
   -e 's|@amdir[@]|$(amdir)|g' \
   -e 's|@bindir[@]|$(bindir)|g' \
diff --git a/tests/defs-static.in b/tests/defs-static.in
index af8f50178..2bae9c1a3 100644
--- a/tests/defs-static.in
+++ b/tests/defs-static.in
@@ -99,6 +99,7 @@ fi
 testsrcdir='@abs_srcdir@'
 top_testsrcdir='@abs_top_srcdir@'
 testbuilddir='@abs_builddir@'
+top_testbuilddir='@abs_top_builddir@'
 testprefix='@prefix@'
 
 # Support for the "installcheck" target.
diff --git a/tests/get-sysconf.test b/tests/get-sysconf.test
index 6e1163e4e..fe78d7090 100755
--- a/tests/get-sysconf.test
+++ b/tests/get-sysconf.test
@@ -22,11 +22,6 @@
 
 . ./defs || Exit 1
 
-# FIXME: remove these once we are merged into master.
-top_testsrcdir=$testsrcdir/..
-testbuilddir=`(cd .. && pwd)`
-top_testbuilddir=`(cd $testbuilddir/.. && pwd)`
-
 st=0
 sed 20q "$top_testsrcdir/ChangeLog" || st=1
 $PERL -V || st=1
diff --git a/tests/java-compile-run-flat.test b/tests/java-compile-run-flat.test
index 3e2bcfd89..4a00aefdb 100755
--- a/tests/java-compile-run-flat.test
+++ b/tests/java-compile-run-flat.test
@@ -149,7 +149,9 @@ END
 ## TESTS ##
 
 cat >> Makefile.am <<'END'
-## FIXME: Use AM_TESTS_ENVIRONMENT here when it becomes available.
+## We must use `TESTS_ENVIRONMENT', not `AM_TESTS_ENVIRONMENT',
+## because the latter is not hnoured by the old serial test
+## harness.
 TESTS_ENVIRONMENT = \
     if test x"$$jprog_doing_installcheck" != x"yes"; then \
         jprog_classpath='$(abs_top_builddir):$(abs_top_srcdir)'; \
diff --git a/tests/java-compile-run-nested.test b/tests/java-compile-run-nested.test
index dbdf4a11e..30bd6a01c 100755
--- a/tests/java-compile-run-nested.test
+++ b/tests/java-compile-run-nested.test
@@ -162,8 +162,7 @@ END
 mkdir tests
 
 cat > tests/Makefile.am <<'END'
-## FIXME: Use AM_TESTS_ENVIRONMENT here when it becomes available.
-TESTS_ENVIRONMENT = \
+AM_TESTS_ENVIRONMENT = \
     if test x"$$jprog_doing_installcheck" != x"yes"; then \
         jprog_classpath='$(abs_top_builddir):$(abs_top_srcdir)'; \
         export jprog_classpath; \
diff --git a/tests/missing-tar.test b/tests/missing-tar.test
index 889ae20d4..72c7f0787 100755
--- a/tests/missing-tar.test
+++ b/tests/missing-tar.test
@@ -14,17 +14,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Test how the `missing' script wraps the`tar' program .
-# FIXME: we should also try to run the `missing' script with the
-#        $CONFIG_SHELL ...
+# Test how the `missing' script wraps the`tar' program.
 
 . ./defs || Exit 1
 
-set -e
-
-# FIXME: make this working with "installcheck" too ...
-cp "$testsrcdir"/../lib/missing . \
-  || fatal_ "failed to fetch auxiliary script \`missing'"
+get_shell_script "missing"
 
 old_PATH=$PATH; export old_PATH
 new_PATH=`pwd`/bin$PATH_SEPARATOR$PATH
diff --git a/tests/tap-realtime.test b/tests/tap-realtime.test
index 1b3d2392c..2cdcda96e 100755
--- a/tests/tap-realtime.test
+++ b/tests/tap-realtime.test
@@ -18,7 +18,7 @@
 #  - testsuite progress on console should happen mostly "in real time";
 #    i.e., it's not acceptable for the driver to wait the end of the
 #    script to start displaying results from it.
-# FIXME: this  test uses expect(1) to ensure line buffering from make and
+# FIXME: this test uses expect(1) to ensure line buffering from make and
 # children, and is pretty hacky and complex; is there a better way to
 # accomplish the checks done here?