Merge branch 'maint'

* maint:
  tests: new variable $am_testaux_builddir
  tests: rename $am_testauxdir -> $am_testaux_srcdir

12 files changed, 13 insertions, 12 deletions

diff --git a/t/ax/tap-summary-aux.sh b/t/ax/tap-summary-aux.sh
index 6f03b6967..d86981fde 100644
--- a/t/ax/tap-summary-aux.sh
+++ b/t/ax/tap-summary-aux.sh
@@ -68,7 +68,7 @@ do_check ()
   else
     test $st -eq 0 || exit 1
   fi
-  $PERL "$am_testauxdir"/extract-testsuite-summary.pl stdout >summary.got \
+  $PERL "$am_testaux_srcdir"/extract-testsuite-summary.pl stdout >summary.got \
     || fatal_ "cannot extract testsuite summary"
   cat summary.exp
   cat summary.got
diff --git a/t/ax/test-defs.in b/t/ax/test-defs.in
index dbfe827c3..ef3176642 100644
--- a/t/ax/test-defs.in
+++ b/t/ax/test-defs.in
@@ -38,7 +38,8 @@ am_top_builddir='@abs_builddir@'
 
 # Where testsuite-related helper scripts, data files and shell libraries
 # are placed.
-am_testauxdir=$am_top_srcdir/t/ax
+am_testaux_srcdir=$am_top_srcdir/t/ax
+am_testaux_builddir=$am_top_builddir/t/ax
 
 # Support for the "installcheck" target.
 case ${am_running_installcheck:=no} in
diff --git a/t/ax/testsuite-summary-checks.sh b/t/ax/testsuite-summary-checks.sh
index 7e65efbf6..647870529 100644
--- a/t/ax/testsuite-summary-checks.sh
+++ b/t/ax/testsuite-summary-checks.sh
@@ -83,7 +83,7 @@ do_check ()
   else
     test $st -eq 0 || exit 1
   fi
-  $PERL "$am_testauxdir"/extract-testsuite-summary.pl stdout >summary.got \
+  $PERL "$am_testaux_srcdir"/extract-testsuite-summary.pl stdout >summary.got \
    || fatal_ "cannot extract testsuite summary"
   cat summary.exp
   cat summary.got
diff --git a/t/distcheck-missing-m4.sh b/t/distcheck-missing-m4.sh
index e396e220d..c35da0cbf 100755
--- a/t/distcheck-missing-m4.sh
+++ b/t/distcheck-missing-m4.sh
@@ -22,7 +22,7 @@
 
 cwd=$(pwd) || fatal_ "cannot get current working directory"
 
-cp "$am_testauxdir"/distcheck-hook-m4.am . \
+cp "$am_testaux_srcdir"/distcheck-hook-m4.am . \
   || fatal_ "cannot fetch makefile fragment 'distcheck-hook-m4.am'"
 
 cat > Makefile.am << 'END'
diff --git a/t/distcheck-outdated-m4.sh b/t/distcheck-outdated-m4.sh
index 81440bd33..fe2fab230 100755
--- a/t/distcheck-outdated-m4.sh
+++ b/t/distcheck-outdated-m4.sh
@@ -22,7 +22,7 @@
 
 cwd=$(pwd) || fatal_ "cannot get current working directory"
 
-cp "$am_testauxdir"/distcheck-hook-m4.am . \
+cp "$am_testaux_srcdir"/distcheck-hook-m4.am . \
   || fatal_ "cannot fetch makefile fragment 'distcheck-hook-m4.am'"
 
 cat > Makefile.am << 'END'
diff --git a/t/self-check-shell-no-trail-bslash.sh b/t/self-check-shell-no-trail-bslash.sh
index 48cfb7fa3..cf9c3a6ff 100755
--- a/t/self-check-shell-no-trail-bslash.sh
+++ b/t/self-check-shell-no-trail-bslash.sh
@@ -33,7 +33,7 @@ bad:
 	@echo $(am__backslash)
 END
 
-SHELL=$am_testauxdir/shell-no-trail-bslash
+SHELL=$am_testaux_builddir/shell-no-trail-bslash
 $SHELL -c 'exit 0'
 test "$($SHELL -c 'echo is  o\k')" = "is ok"
 
diff --git a/t/test-driver-acsubst.sh b/t/test-driver-acsubst.sh
index e8d24ac17..076235d67 100755
--- a/t/test-driver-acsubst.sh
+++ b/t/test-driver-acsubst.sh
@@ -21,7 +21,7 @@
 
 mkdir test-drivers
 
-cp "$am_testauxdir"/trivial-test-driver test-drivers/triv \
+cp "$am_testaux_srcdir"/trivial-test-driver test-drivers/triv \
   || fatal_ "failed to fetch auxiliary script trivial-test-driver"
 cp "$am_scriptdir"/test-driver test-drivers/dflt \
   || fatal_ "failed to fetch auxiliary script test-driver"
diff --git a/t/test-driver-cond.sh b/t/test-driver-cond.sh
index a96792da2..f2eb8d240 100755
--- a/t/test-driver-cond.sh
+++ b/t/test-driver-cond.sh
@@ -20,7 +20,7 @@
 
 . test-init.sh
 
-cp "$am_testauxdir"/trivial-test-driver . \
+cp "$am_testaux_srcdir"/trivial-test-driver . \
   || fatal_ "failed to fetch auxiliary script trivial-test-driver"
 cp "$am_scriptdir"/tap-driver.pl . \
   || fatal_ "failed to fetch auxiliary script tap-driver.pl"
diff --git a/t/test-driver-custom-multitest-recheck.sh b/t/test-driver-custom-multitest-recheck.sh
index 99197a5c0..e27f56fb1 100755
--- a/t/test-driver-custom-multitest-recheck.sh
+++ b/t/test-driver-custom-multitest-recheck.sh
@@ -24,7 +24,7 @@
 
 . test-init.sh
 
-cp "$am_testauxdir"/trivial-test-driver . \
+cp "$am_testaux_srcdir"/trivial-test-driver . \
   || fatal_ "failed to fetch auxiliary script trivial-test-driver"
 
 cat >> configure.ac << 'END'
diff --git a/t/test-driver-custom-multitest-recheck2.sh b/t/test-driver-custom-multitest-recheck2.sh
index b87d035a1..d72ebf879 100755
--- a/t/test-driver-custom-multitest-recheck2.sh
+++ b/t/test-driver-custom-multitest-recheck2.sh
@@ -23,7 +23,7 @@
 
 . test-init.sh
 
-cp "$am_testauxdir"/trivial-test-driver . \
+cp "$am_testaux_srcdir"/trivial-test-driver . \
   || fatal_ "failed to fetch auxiliary script trivial-test-driver"
 
 cat >> configure.ac << 'END'
diff --git a/t/test-driver-custom-multitest.sh b/t/test-driver-custom-multitest.sh
index b3b7b2aa9..b68333ed0 100755
--- a/t/test-driver-custom-multitest.sh
+++ b/t/test-driver-custom-multitest.sh
@@ -21,7 +21,7 @@
 
 . test-init.sh
 
-cp "$am_testauxdir"/trivial-test-driver . \
+cp "$am_testaux_srcdir"/trivial-test-driver . \
   || fatal_ "failed to fetch auxiliary script trivial-test-driver"
 
 cat >> configure.ac << 'END'
diff --git a/t/testsuite-summary-count-many.sh b/t/testsuite-summary-count-many.sh
index 866b92251..7fee21d90 100755
--- a/t/testsuite-summary-count-many.sh
+++ b/t/testsuite-summary-count-many.sh
@@ -22,7 +22,7 @@
 . test-init.sh
 
 for s in trivial-test-driver extract-testsuite-summary.pl; do
-  cp "$am_testauxdir/$s" . || fatal_ "failed to fetch auxiliary script $s"
+  cp "$am_testaux_srcdir/$s" . || fatal_ "failed to fetch auxiliary script $s"
 done
 
 br='============================================================================'