tests: more faithful 'installcheck' support in few tests

* tests/ar-lib5a.test: Use the `$am_scriptdir' variable instead
of "$testsrcdir/../lib" or "$top_testsrcdir/lib", to test more
faithfully under "make installcheck".
* tests/ar-lib5a.test: Likewise.
* tests/libobj-basic.test: Likewise.
* tests/libobj19.test: Likewise.
* tests/suffix5.test: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 3faaf178b367f00ab19206213b40b9d1bbc99cce..2269ed7f1aec499bcf3cd9e435bd65e45ba720c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-11-05  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       tests: more faithful 'installcheck' support in few tests
+       * tests/ar-lib5a.test: Use the `$am_scriptdir' variable instead
+       of "$testsrcdir/../lib" or "$top_testsrcdir/lib", to test more
+       faithfully under "make installcheck".
+       * tests/ar-lib5a.test: Likewise.
+       * tests/libobj-basic.test: Likewise.
+       * tests/libobj19.test: Likewise.
+       * tests/suffix5.test: Likewise.
+
 2011-11-05  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        tests: remove redundant settings of `errexit' shell flag

diff --git a/tests/ar-lib5a.test b/tests/ar-lib5a.test
index 8c9b6ebd914d9d6a3ed58bcd1a6e7e300e910785..8f1d2279cfccaff71ab5f7b5db3acc0ce6ff2dc2 100755 (executable)
--- a/tests/ar-lib5a.test
+++ b/tests/ar-lib5a.test
@@ -50,9 +50,7 @@ int wish(void) { return 0; }
 END
 
 mkdir auxdir
-# FIXME: make this "installcheck-aware" once we are merged into the
-#        'testsuite-work' branch.
-cat - "$testsrcdir"/../lib/ar-lib > auxdir/ar-lib << 'END'
+cat - "$am_scriptdir/ar-lib" > auxdir/ar-lib << 'END'
 #! /bin/sh
 :> ar-lib-worked
 END

diff --git a/tests/libobj-basic.test b/tests/libobj-basic.test
index a31d7eb12480756405c659349fdf07209caa6279..65782647c1bc1d8925a621a4698441013cb464e6 100755 (executable)
--- a/tests/libobj-basic.test
+++ b/tests/libobj-basic.test
@@ -78,8 +78,7 @@ cat > extra-checks.am << 'END'
 extra_checks = maude-src maude-dist liver-not-dist
 END
 
-# FIXME: improve support for "installcheck" here.
-cp "$top_testsrcdir/lib/ar-lib" . || Exit 99
+cp "$am_scriptdir/ar-lib" . || fatal_ "fetching auxiliary script \`ar-lib'"
 
 $ACLOCAL
 $AUTOCONF

diff --git a/tests/libobj19.test b/tests/libobj19.test
index 7fb65313b15997542256fc3688f131d4802a83c2..79334d946ddf315e349e70658b44eb39feda9738 100755 (executable)
--- a/tests/libobj19.test
+++ b/tests/libobj19.test
@@ -53,8 +53,7 @@ cat > libobj-dir/foobar.c << 'END'
 extern int dummy;
 END
 
-# FIXME: improve support for "installcheck" here.
-cp "$top_testsrcdir/lib/ar-lib" . || Exit 99
+cp "$am_scriptdir/ar-lib" . || fatal_ "fetching auxiliary script \`ar-lib'"
 
 $ACLOCAL
 $AUTOCONF

diff --git a/tests/suffix5.test b/tests/suffix5.test
index 113a40ad44e591da07585637d92328abe19c1388..fcde0b68cc5cbbf2eed48bdc33b0894e57d45f8a 100755 (executable)
--- a/tests/suffix5.test
+++ b/tests/suffix5.test
@@ -46,9 +46,8 @@ END
 
 : > ltmain.sh
 
-# FIXME: better support for installcheck.
 for auxscript in ar-lib config.guess config.sub; do
-  cp "$top_testsrcdir/lib/$auxscript" . \
+  cp "$am_scriptdir/$auxscript" . \
     || fatal_ "fetching auxiliary script \`$auxscript'"
 done