From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 7 Nov 2012 20:51:01 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v1.12b~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93c2c33e04e4e5b78da45ec8c251899acce5d322;p=thirdparty%2Fautomake.git

Merge branch 'maint'

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

93c2c33e04e4e5b78da45ec8c251899acce5d322
diff --cc t/test-driver-cond.sh
index a96792da2,470958259..f2eb8d240
--- a/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 99197a5c0,55a6b93db..e27f56fb1
--- a/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 b87d035a1,54fd46771..d72ebf879
--- a/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 b3b7b2aa9,7a073e26e..b68333ed0
--- a/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 866b92251,553df50ae..7fee21d90
--- a/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='============================================================================'