Merge branch 'maint'

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

diff --cc t/ax/tap-summary-aux.sh
Simple merge

diff --cc t/ax/testsuite-summary-checks.sh
Simple merge

diff --cc t/distcheck-missing-m4.sh
Simple merge

diff --cc t/distcheck-outdated-m4.sh
Simple merge

diff --cc t/test-driver-acsubst.sh
Simple merge

diff --cc t/test-driver-cond.sh
index a96792da2adddb7d62f50238dd877d184f167d51,470958259b66b311b6d24c6fa45bc665999bc33f..f2eb8d2402817154c6dd83ad08f3ae4665d38ff5
--- 1/t/test-driver-cond.sh
--- 2/t/test-driver-cond.sh
+++ b/t/test-driver-cond.sh
@@@ -18,9 -18,9 +18,9 @@@
  #   - Automake can correctly handle conditionals contents for the
  #     LOG_DRIVER variables.
  
 -. ./defs || exit 1
 +. 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 --cc t/test-driver-custom-multitest-recheck.sh
index 99197a5c01c28a01b7332c6f535603aa3bb120e1,55a6b93db86d3ce9e519265eb6ca921432f71642..e27f56fb12335a5930fb7720cc997a4ed29d88b2
--- 1/t/test-driver-custom-multitest-recheck.sh
--- 2/t/test-driver-custom-multitest-recheck.sh
+++ b/t/test-driver-custom-multitest-recheck.sh
@@@ -22,9 -22,9 +22,9 @@@
  # and 'parallel-tests-recheck-override.sh'.
  # Keep in sync with 'tap-recheck.sh'.
  
 -. ./defs || exit 1
 +. 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 --cc t/test-driver-custom-multitest-recheck2.sh
index b87d035a171dfa9a745097291a83a815edbb0a20,54fd46771553cb01392fdd800c53a84d08e50d5d..d72ebf8790f70a7eb75efdae2919fbcfb1927500
--- 1/t/test-driver-custom-multitest-recheck2.sh
--- 2/t/test-driver-custom-multitest-recheck2.sh
+++ b/t/test-driver-custom-multitest-recheck2.sh
@@@ -21,9 -21,9 +21,9 @@@
  # See also related tests 'test-driver-custom-multitest-recheck.sh' and
  # 'parallel-tests-recheck-override.sh'.
  
 -. ./defs || exit 1
 +. 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 --cc t/test-driver-custom-multitest.sh
index b3b7b2aa9fd1f1de099f09b8ee1494ec9029c45d,7a073e26ec875be8d4fa101e56a6cd32183f07ca..b68333ed0b30dab6904bffe69c56cf59c0724e6d
--- 1/t/test-driver-custom-multitest.sh
--- 2/t/test-driver-custom-multitest.sh
+++ b/t/test-driver-custom-multitest.sh
@@@ -19,9 -19,9 +19,9 @@@
  # only checks implementation details in Automake's custom test drivers
  # support, but also serves as a "usability test" for our APIs.
  
 -. ./defs || exit 1
 +. 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 --cc t/testsuite-summary-count-many.sh
index 866b92251c30554dd5ca5c73b12d691101e66eb8,553df50ae2094b3c4278ba16912742e53375438c..7fee21d905341410d11a5d94229e827d80894e99
--- 1/t/testsuite-summary-count-many.sh
--- 2/t/testsuite-summary-count-many.sh
+++ b/t/testsuite-summary-count-many.sh
@@@ -19,10 -19,10 +19,10 @@@
  # Incidentally, this test also checks that the testsuite summary doesn't
  # give any bug-report address if it's not defined.
  
 -. ./defs || exit 1
 +. 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='============================================================================'