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 a96792d,4709582..f2eb8d2
--- 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 99197a5,55a6b93..e27f56f
--- 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 b87d035,54fd467..d72ebf8
--- 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 b3b7b2a,7a073e2..b68333e
--- 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 866b922,553df50..7fee21d
--- 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='============================================================================'