From: Gary V. Vaughan <gary@gnu.org>
Date: Sun, 6 Nov 2011 05:14:40 +0000 (+0700)
Subject: tests: prefix absolute directory variables with 'abs_'.
X-Git-Tag: v2.4.2.418~295
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0569ec6cd2df2b10136e5701411961b83142d567;p=thirdparty%2Flibtool.git

tests: prefix absolute directory variables with 'abs_'.

Avoid any possible confusion about the contests of thes
variables compared to $aux_dir, $macro_dir and $src_dir in
configure.ac, Makefile.am, libtoolize.m4sh and others.
* tests/defs.m4sh (aux_dir, macro_dir, srcdir): Rename these...
(abs_aux_dir, abs_macro_dir, abs_srcdir): ...to these resp.
* tests/cdemo-shared-exec.test, tests/cdemo-shared-make.test,
tests/cdemo-static-exec.test, tests/cdemo-static-make.test,
tests/cdemo-undef-exec.test, tests/cdemo-undef-make.test,
tests/demo-nofast-exec.test, tests/demo-nofast-inst.test,
tests/demo-nofast-make.test, tests/demo-nofast-unst.test,
tests/demo-nopic-exec.test, tests/demo-nopic-make.test,
tests/demo-pic-exec.test, tests/demo-pic-make.test,
tests/demo-shared-exec.test, tests/demo-shared-inst.test,
tests/demo-shared-make.test, tests/demo-shared-unst.test,
tests/demo-static-exec.test, tests/demo-static-inst.test,
tests/demo-static-make.test, tests/demo-static-unst.test,
tests/depdemo-nofast-exec.test, tests/depdemo-nofast-inst.test,
tests/depdemo-nofast-make.test, tests/depdemo-nofast-unst.test,
tests/depdemo-shared-exec.test, tests/depdemo-shared-inst.test,
tests/depdemo-shared-make.test, tests/depdemo-shared-unst.test,
tests/depdemo-static-exec.test, tests/depdemo-static-inst.test,
tests/depdemo-static-make.test, tests/depdemo-static-unst.test,
tests/f77demo-shared-exec.test, tests/f77demo-shared-make.test,
tests/f77demo-static-exec.test, tests/f77demo-static-make.test,
tests/fcdemo-shared-exec.test, tests/fcdemo-shared-make.test,
tests/fcdemo-static-exec.test, tests/fcdemo-static-make.test,
tests/mdemo-shared-exec.test, tests/mdemo-shared-inst.test,
tests/mdemo-shared-make.test, tests/mdemo-shared-unst.test,
tests/mdemo-static-exec.test, tests/mdemo-static-inst.test,
tests/mdemo-static-make.test, tests/mdemo-static-unst.test,
tests/sh.test, tests/tagdemo-shared-exec.test,
tests/tagdemo-shared-make.test, tests/tagdemo-static-exec.test,
tests/tagdemo-static-make.test, tests/tagdemo-undef-exec.test,
tests/tagdemo-undef-make.test, tests/tagtrace.test: Adjust.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>
---

diff --git a/tests/cdemo-shared-exec.test b/tests/cdemo-shared-exec.test
index 6de58fd56..c784065a3 100755
--- a/tests/cdemo-shared-exec.test
+++ b/tests/cdemo-shared-exec.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/cdemo-exec.test
+. $abs_srcdir/tests/cdemo-exec.test
diff --git a/tests/cdemo-shared-make.test b/tests/cdemo-shared-make.test
index cb3792c42..254b3d41e 100755
--- a/tests/cdemo-shared-make.test
+++ b/tests/cdemo-shared-make.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/cdemo-make.test
+. $abs_srcdir/tests/cdemo-make.test
diff --git a/tests/cdemo-static-exec.test b/tests/cdemo-static-exec.test
index 6de58fd56..c784065a3 100755
--- a/tests/cdemo-static-exec.test
+++ b/tests/cdemo-static-exec.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/cdemo-exec.test
+. $abs_srcdir/tests/cdemo-exec.test
diff --git a/tests/cdemo-static-make.test b/tests/cdemo-static-make.test
index cb3792c42..254b3d41e 100755
--- a/tests/cdemo-static-make.test
+++ b/tests/cdemo-static-make.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/cdemo-make.test
+. $abs_srcdir/tests/cdemo-make.test
diff --git a/tests/cdemo-undef-exec.test b/tests/cdemo-undef-exec.test
index 6de58fd56..c784065a3 100755
--- a/tests/cdemo-undef-exec.test
+++ b/tests/cdemo-undef-exec.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/cdemo-exec.test
+. $abs_srcdir/tests/cdemo-exec.test
diff --git a/tests/cdemo-undef-make.test b/tests/cdemo-undef-make.test
index cb3792c42..254b3d41e 100755
--- a/tests/cdemo-undef-make.test
+++ b/tests/cdemo-undef-make.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/cdemo-make.test
+. $abs_srcdir/tests/cdemo-make.test
diff --git a/tests/defs.m4sh b/tests/defs.m4sh
index 76ca7d403..56f1ecc11 100644
--- a/tests/defs.m4sh
+++ b/tests/defs.m4sh
@@ -185,7 +185,7 @@ func_configure_nofail ()
     my_args=${1+"$@"}
     func_dirname_and_basename "`pwd`"
     my_dir=$func_basename_result
-    my_testdir="$srcdir/tests/$my_dir"
+    my_testdir="$abs_srcdir/tests/$my_dir"
     conf_status=$EXIT_FAILURE
 
     test -n "$my_args" && my_args=" $my_args"
@@ -349,10 +349,10 @@ func_exec ()
 
 # Shared global variables for test scripts
 prefix=./_inst-`echo "$0" | sed 's,.*/,,; s,-.*,,'`
-srcdir=`cd '@srcdir@' && pwd`
-macro_dir=`cd '@srcdir@/@macro_dir@' && pwd`
-aux_dir=`cd '@srcdir@/@aux_dir@' && pwd`
-scripts="$aux_dir/ltmain.m4sh $srcdir/libtoolize.m4sh"
+abs_srcdir=`cd '@srcdir@' && pwd`
+abs_macro_dir=`cd '@srcdir@/@macro_dir@' && pwd`
+abs_aux_dir=`cd '@srcdir@/@aux_dir@' && pwd`
+scripts="$abs_aux_dir/ltmain.m4sh $abs_srcdir/libtoolize.m4sh"
 
 # Unset some MAKE... variables that may cause $MAKE to act like a
 # recursively invoked sub-make.  Any $MAKE invocation in a test is
diff --git a/tests/demo-nofast-exec.test b/tests/demo-nofast-exec.test
index 82e272d0a..6745d2e4e 100755
--- a/tests/demo-nofast-exec.test
+++ b/tests/demo-nofast-exec.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/demo-exec.test
+. $abs_srcdir/tests/demo-exec.test
diff --git a/tests/demo-nofast-inst.test b/tests/demo-nofast-inst.test
index 02e87c1f2..0213f20de 100755
--- a/tests/demo-nofast-inst.test
+++ b/tests/demo-nofast-inst.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/demo-inst.test
+. $abs_srcdir/tests/demo-inst.test
diff --git a/tests/demo-nofast-make.test b/tests/demo-nofast-make.test
index c902d85ca..04bee2fe1 100755
--- a/tests/demo-nofast-make.test
+++ b/tests/demo-nofast-make.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/demo-make.test
+. $abs_srcdir/tests/demo-make.test
diff --git a/tests/demo-nofast-unst.test b/tests/demo-nofast-unst.test
index 789a487f1..97a250f5a 100755
--- a/tests/demo-nofast-unst.test
+++ b/tests/demo-nofast-unst.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/demo-unst.test
+. $abs_srcdir/tests/demo-unst.test
diff --git a/tests/demo-nopic-exec.test b/tests/demo-nopic-exec.test
index 82e272d0a..6745d2e4e 100755
--- a/tests/demo-nopic-exec.test
+++ b/tests/demo-nopic-exec.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/demo-exec.test
+. $abs_srcdir/tests/demo-exec.test
diff --git a/tests/demo-nopic-make.test b/tests/demo-nopic-make.test
index c902d85ca..04bee2fe1 100755
--- a/tests/demo-nopic-make.test
+++ b/tests/demo-nopic-make.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/demo-make.test
+. $abs_srcdir/tests/demo-make.test
diff --git a/tests/demo-pic-exec.test b/tests/demo-pic-exec.test
index 82e272d0a..6745d2e4e 100755
--- a/tests/demo-pic-exec.test
+++ b/tests/demo-pic-exec.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/demo-exec.test
+. $abs_srcdir/tests/demo-exec.test
diff --git a/tests/demo-pic-make.test b/tests/demo-pic-make.test
index c902d85ca..04bee2fe1 100755
--- a/tests/demo-pic-make.test
+++ b/tests/demo-pic-make.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/demo-make.test
+. $abs_srcdir/tests/demo-make.test
diff --git a/tests/demo-shared-exec.test b/tests/demo-shared-exec.test
index 82e272d0a..6745d2e4e 100755
--- a/tests/demo-shared-exec.test
+++ b/tests/demo-shared-exec.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/demo-exec.test
+. $abs_srcdir/tests/demo-exec.test
diff --git a/tests/demo-shared-inst.test b/tests/demo-shared-inst.test
index 02e87c1f2..0213f20de 100755
--- a/tests/demo-shared-inst.test
+++ b/tests/demo-shared-inst.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/demo-inst.test
+. $abs_srcdir/tests/demo-inst.test
diff --git a/tests/demo-shared-make.test b/tests/demo-shared-make.test
index c902d85ca..04bee2fe1 100755
--- a/tests/demo-shared-make.test
+++ b/tests/demo-shared-make.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/demo-make.test
+. $abs_srcdir/tests/demo-make.test
diff --git a/tests/demo-shared-unst.test b/tests/demo-shared-unst.test
index 789a487f1..97a250f5a 100755
--- a/tests/demo-shared-unst.test
+++ b/tests/demo-shared-unst.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/demo-unst.test
+. $abs_srcdir/tests/demo-unst.test
diff --git a/tests/demo-static-exec.test b/tests/demo-static-exec.test
index 82e272d0a..6745d2e4e 100755
--- a/tests/demo-static-exec.test
+++ b/tests/demo-static-exec.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/demo-exec.test
+. $abs_srcdir/tests/demo-exec.test
diff --git a/tests/demo-static-inst.test b/tests/demo-static-inst.test
index 02e87c1f2..0213f20de 100755
--- a/tests/demo-static-inst.test
+++ b/tests/demo-static-inst.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/demo-inst.test
+. $abs_srcdir/tests/demo-inst.test
diff --git a/tests/demo-static-make.test b/tests/demo-static-make.test
index c902d85ca..04bee2fe1 100755
--- a/tests/demo-static-make.test
+++ b/tests/demo-static-make.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/demo-make.test
+. $abs_srcdir/tests/demo-make.test
diff --git a/tests/demo-static-unst.test b/tests/demo-static-unst.test
index 789a487f1..97a250f5a 100755
--- a/tests/demo-static-unst.test
+++ b/tests/demo-static-unst.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/demo-unst.test
+. $abs_srcdir/tests/demo-unst.test
diff --git a/tests/depdemo-nofast-exec.test b/tests/depdemo-nofast-exec.test
index 5b1410420..36dfc6c66 100755
--- a/tests/depdemo-nofast-exec.test
+++ b/tests/depdemo-nofast-exec.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/depdemo-exec.test
+. $abs_srcdir/tests/depdemo-exec.test
diff --git a/tests/depdemo-nofast-inst.test b/tests/depdemo-nofast-inst.test
index b22013e80..4b7663c7e 100755
--- a/tests/depdemo-nofast-inst.test
+++ b/tests/depdemo-nofast-inst.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/depdemo-inst.test
+. $abs_srcdir/tests/depdemo-inst.test
diff --git a/tests/depdemo-nofast-make.test b/tests/depdemo-nofast-make.test
index e8cb46730..6d49deea3 100755
--- a/tests/depdemo-nofast-make.test
+++ b/tests/depdemo-nofast-make.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/depdemo-make.test
+. $abs_srcdir/tests/depdemo-make.test
diff --git a/tests/depdemo-nofast-unst.test b/tests/depdemo-nofast-unst.test
index f3ccf3ff5..e2c258d6d 100755
--- a/tests/depdemo-nofast-unst.test
+++ b/tests/depdemo-nofast-unst.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/depdemo-unst.test
+. $abs_srcdir/tests/depdemo-unst.test
diff --git a/tests/depdemo-shared-exec.test b/tests/depdemo-shared-exec.test
index 5b1410420..36dfc6c66 100755
--- a/tests/depdemo-shared-exec.test
+++ b/tests/depdemo-shared-exec.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/depdemo-exec.test
+. $abs_srcdir/tests/depdemo-exec.test
diff --git a/tests/depdemo-shared-inst.test b/tests/depdemo-shared-inst.test
index b22013e80..4b7663c7e 100755
--- a/tests/depdemo-shared-inst.test
+++ b/tests/depdemo-shared-inst.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/depdemo-inst.test
+. $abs_srcdir/tests/depdemo-inst.test
diff --git a/tests/depdemo-shared-make.test b/tests/depdemo-shared-make.test
index e8cb46730..6d49deea3 100755
--- a/tests/depdemo-shared-make.test
+++ b/tests/depdemo-shared-make.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/depdemo-make.test
+. $abs_srcdir/tests/depdemo-make.test
diff --git a/tests/depdemo-shared-unst.test b/tests/depdemo-shared-unst.test
index f3ccf3ff5..e2c258d6d 100755
--- a/tests/depdemo-shared-unst.test
+++ b/tests/depdemo-shared-unst.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/depdemo-unst.test
+. $abs_srcdir/tests/depdemo-unst.test
diff --git a/tests/depdemo-static-exec.test b/tests/depdemo-static-exec.test
index 5b1410420..36dfc6c66 100755
--- a/tests/depdemo-static-exec.test
+++ b/tests/depdemo-static-exec.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/depdemo-exec.test
+. $abs_srcdir/tests/depdemo-exec.test
diff --git a/tests/depdemo-static-inst.test b/tests/depdemo-static-inst.test
index b22013e80..4b7663c7e 100755
--- a/tests/depdemo-static-inst.test
+++ b/tests/depdemo-static-inst.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/depdemo-inst.test
+. $abs_srcdir/tests/depdemo-inst.test
diff --git a/tests/depdemo-static-make.test b/tests/depdemo-static-make.test
index e8cb46730..6d49deea3 100755
--- a/tests/depdemo-static-make.test
+++ b/tests/depdemo-static-make.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/depdemo-make.test
+. $abs_srcdir/tests/depdemo-make.test
diff --git a/tests/depdemo-static-unst.test b/tests/depdemo-static-unst.test
index f3ccf3ff5..e2c258d6d 100755
--- a/tests/depdemo-static-unst.test
+++ b/tests/depdemo-static-unst.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/depdemo-unst.test
+. $abs_srcdir/tests/depdemo-unst.test
diff --git a/tests/f77demo-shared-exec.test b/tests/f77demo-shared-exec.test
index b88eb16e9..b9fdb0338 100755
--- a/tests/f77demo-shared-exec.test
+++ b/tests/f77demo-shared-exec.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/f77demo-exec.test
+. $abs_srcdir/tests/f77demo-exec.test
diff --git a/tests/f77demo-shared-make.test b/tests/f77demo-shared-make.test
index e68f6de9b..bee5491f5 100755
--- a/tests/f77demo-shared-make.test
+++ b/tests/f77demo-shared-make.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/f77demo-make.test
+. $abs_srcdir/tests/f77demo-make.test
diff --git a/tests/f77demo-static-exec.test b/tests/f77demo-static-exec.test
index b88eb16e9..b9fdb0338 100755
--- a/tests/f77demo-static-exec.test
+++ b/tests/f77demo-static-exec.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/f77demo-exec.test
+. $abs_srcdir/tests/f77demo-exec.test
diff --git a/tests/f77demo-static-make.test b/tests/f77demo-static-make.test
index e68f6de9b..bee5491f5 100755
--- a/tests/f77demo-static-make.test
+++ b/tests/f77demo-static-make.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/f77demo-make.test
+. $abs_srcdir/tests/f77demo-make.test
diff --git a/tests/fcdemo-shared-exec.test b/tests/fcdemo-shared-exec.test
index 46ea71f40..84b20a0ad 100755
--- a/tests/fcdemo-shared-exec.test
+++ b/tests/fcdemo-shared-exec.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/fcdemo-exec.test
+. $abs_srcdir/tests/fcdemo-exec.test
diff --git a/tests/fcdemo-shared-make.test b/tests/fcdemo-shared-make.test
index 5fc2c3745..3c20e3fb2 100755
--- a/tests/fcdemo-shared-make.test
+++ b/tests/fcdemo-shared-make.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/fcdemo-make.test
+. $abs_srcdir/tests/fcdemo-make.test
diff --git a/tests/fcdemo-static-exec.test b/tests/fcdemo-static-exec.test
index 46ea71f40..84b20a0ad 100755
--- a/tests/fcdemo-static-exec.test
+++ b/tests/fcdemo-static-exec.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/fcdemo-exec.test
+. $abs_srcdir/tests/fcdemo-exec.test
diff --git a/tests/fcdemo-static-make.test b/tests/fcdemo-static-make.test
index 5fc2c3745..3c20e3fb2 100755
--- a/tests/fcdemo-static-make.test
+++ b/tests/fcdemo-static-make.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/fcdemo-make.test
+. $abs_srcdir/tests/fcdemo-make.test
diff --git a/tests/mdemo-shared-exec.test b/tests/mdemo-shared-exec.test
index d20ae6437..17240b03a 100755
--- a/tests/mdemo-shared-exec.test
+++ b/tests/mdemo-shared-exec.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/mdemo-exec.test
+. $abs_srcdir/tests/mdemo-exec.test
diff --git a/tests/mdemo-shared-inst.test b/tests/mdemo-shared-inst.test
index 81e7b60de..7b8f7a692 100755
--- a/tests/mdemo-shared-inst.test
+++ b/tests/mdemo-shared-inst.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/mdemo-inst.test
+. $abs_srcdir/tests/mdemo-inst.test
diff --git a/tests/mdemo-shared-make.test b/tests/mdemo-shared-make.test
index 490230edc..ef661d82b 100755
--- a/tests/mdemo-shared-make.test
+++ b/tests/mdemo-shared-make.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/mdemo-make.test
+. $abs_srcdir/tests/mdemo-make.test
diff --git a/tests/mdemo-shared-unst.test b/tests/mdemo-shared-unst.test
index 6f1cbae45..100ab8e3c 100755
--- a/tests/mdemo-shared-unst.test
+++ b/tests/mdemo-shared-unst.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/mdemo-unst.test
+. $abs_srcdir/tests/mdemo-unst.test
diff --git a/tests/mdemo-static-exec.test b/tests/mdemo-static-exec.test
index d20ae6437..17240b03a 100755
--- a/tests/mdemo-static-exec.test
+++ b/tests/mdemo-static-exec.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/mdemo-exec.test
+. $abs_srcdir/tests/mdemo-exec.test
diff --git a/tests/mdemo-static-inst.test b/tests/mdemo-static-inst.test
index 81e7b60de..7b8f7a692 100755
--- a/tests/mdemo-static-inst.test
+++ b/tests/mdemo-static-inst.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/mdemo-inst.test
+. $abs_srcdir/tests/mdemo-inst.test
diff --git a/tests/mdemo-static-make.test b/tests/mdemo-static-make.test
index 490230edc..ef661d82b 100755
--- a/tests/mdemo-static-make.test
+++ b/tests/mdemo-static-make.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/mdemo-make.test
+. $abs_srcdir/tests/mdemo-make.test
diff --git a/tests/mdemo-static-unst.test b/tests/mdemo-static-unst.test
index 6f1cbae45..100ab8e3c 100755
--- a/tests/mdemo-static-unst.test
+++ b/tests/mdemo-static-unst.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/mdemo-unst.test
+. $abs_srcdir/tests/mdemo-unst.test
diff --git a/tests/sh.test b/tests/sh.test
index 2435ab26b..3382dad3b 100755
--- a/tests/sh.test
+++ b/tests/sh.test
@@ -121,7 +121,7 @@ done
 
 # Check for correct usage of $cc_basename.
 # redirect stderr so we also barf when sed issues diagnostics.
-for s in "$macro_dir/libtool.m4"
+for s in "$abs_macro_dir/libtool.m4"
 do
   if $SED -n '/case \$cc_basename in/,/esac/ {
 	      /^[ 	]*[a-zA-Z][a-zA-Z0-9+]*[^*][ 	]*)/p
diff --git a/tests/tagdemo-shared-exec.test b/tests/tagdemo-shared-exec.test
index ecf553a65..43338b0bc 100755
--- a/tests/tagdemo-shared-exec.test
+++ b/tests/tagdemo-shared-exec.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/tagdemo-exec.test
+. $abs_srcdir/tests/tagdemo-exec.test
diff --git a/tests/tagdemo-shared-make.test b/tests/tagdemo-shared-make.test
index 9ffbd4905..6add5f1f9 100755
--- a/tests/tagdemo-shared-make.test
+++ b/tests/tagdemo-shared-make.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/tagdemo-make.test
+. $abs_srcdir/tests/tagdemo-make.test
diff --git a/tests/tagdemo-static-exec.test b/tests/tagdemo-static-exec.test
index ecf553a65..43338b0bc 100755
--- a/tests/tagdemo-static-exec.test
+++ b/tests/tagdemo-static-exec.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/tagdemo-exec.test
+. $abs_srcdir/tests/tagdemo-exec.test
diff --git a/tests/tagdemo-static-make.test b/tests/tagdemo-static-make.test
index 9ffbd4905..6add5f1f9 100755
--- a/tests/tagdemo-static-make.test
+++ b/tests/tagdemo-static-make.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/tagdemo-make.test
+. $abs_srcdir/tests/tagdemo-make.test
diff --git a/tests/tagdemo-undef-exec.test b/tests/tagdemo-undef-exec.test
index ecf553a65..43338b0bc 100755
--- a/tests/tagdemo-undef-exec.test
+++ b/tests/tagdemo-undef-exec.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/tagdemo-exec.test
+. $abs_srcdir/tests/tagdemo-exec.test
diff --git a/tests/tagdemo-undef-make.test b/tests/tagdemo-undef-make.test
index 9ffbd4905..6add5f1f9 100755
--- a/tests/tagdemo-undef-make.test
+++ b/tests/tagdemo-undef-make.test
@@ -1,3 +1,3 @@
 #! /bin/sh
 . tests/defs || exit 1
-. $srcdir/tests/tagdemo-make.test
+. $abs_srcdir/tests/tagdemo-make.test
diff --git a/tests/tagtrace.test b/tests/tagtrace.test
index 47997474c..3c32333fe 100755
--- a/tests/tagtrace.test
+++ b/tests/tagtrace.test
@@ -24,7 +24,7 @@
 
 . tests/defs || exit 1
 
-: ${fnord=$srcdir/fnord$$}
+: ${fnord=$abs_srcdir/fnord$$}
 
 $AUTOCONF --version > /dev/null 2>&1 || func_skip "This test requires GNU Autoconf"
 if touch $fnord; then
@@ -33,7 +33,7 @@ else
   func_skip "This test requires write access to the source tree"
 fi
 
-( cd "$srcdir" && $AUTOCONF --trace 'LT_SUPPORTED_TAG:$1' ) >/dev/null
+( cd "$abs_srcdir" && $AUTOCONF --trace 'LT_SUPPORTED_TAG:$1' ) >/dev/null
 ret=$?
 if test $ret -eq 63 || test $ret -eq 1; then
   func_error "This test requires the same Autoconf version"
@@ -46,7 +46,7 @@ fi
 set -e
 
 # Retrieve the list of tags supported by our main libtool script.
-traced_tags=`cd "$srcdir" && $AUTOCONF --trace 'LT_SUPPORTED_TAG:$1'`
+traced_tags=`cd "$abs_srcdir" && $AUTOCONF --trace 'LT_SUPPORTED_TAG:$1'`
 
 test -n "$traced_tags"