[FYI] {testsuite-work} tests: more faithful 'installcheck' support in few tests

[Stefano Lattarini]

* 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.
---
 ChangeLog               |   11 +++++++++++
 tests/ar-lib5a.test     |    4 +---
 tests/libobj-basic.test |    3 +--
 tests/libobj19.test     |    3 +--
 tests/suffix5.test      |    3 +--
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 299216d..9c89814 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2011-11-05  Stefano Lattarini  <address@hidden>
 
+       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  <address@hidden>
+
        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/ar-lib5a.test b/tests/ar-lib5a.test
index 8c9b6eb..8f1d227 100755
--- 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 a31d7eb..6578264 100755
--- 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 7fb6531..79334d9 100755
--- 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 113a40a..fcde0b6 100755
--- 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
 
-- 
1.7.2.3