[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.12.3-59-gbd0d41d

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=bd0d41d77f0d8a24bb8e6aac3bf580cbe741f88e

The branch, maint has been updated
       via  bd0d41d77f0d8a24bb8e6aac3bf580cbe741f88e (commit)
       via  622358354392072ce81e50ec52377d3bdbf93f22 (commit)
      from  0494881b53d6a125c1e4feeb03101de351085a1b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 t/ax/tap-summary-aux.sh                    |    2 +-
 t/ax/test-defs.in                          |    3 ++-
 t/ax/testsuite-summary-checks.sh           |    2 +-
 t/distcheck-missing-m4.sh                  |    2 +-
 t/distcheck-outdated-m4.sh                 |    2 +-
 t/self-check-shell-no-trail-bslash.sh      |    2 +-
 t/test-driver-acsubst.sh                   |    2 +-
 t/test-driver-cond.sh                      |    2 +-
 t/test-driver-custom-multitest-recheck.sh  |    2 +-
 t/test-driver-custom-multitest-recheck2.sh |    2 +-
 t/test-driver-custom-multitest.sh          |    2 +-
 t/testsuite-summary-count-many.sh          |    2 +-
 12 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/t/ax/tap-summary-aux.sh b/t/ax/tap-summary-aux.sh
index 156c4ad..3918830 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 dbfe827..ef31766 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 54d76cd..fd74a7f 100644
--- a/t/ax/testsuite-summary-checks.sh
+++ b/t/ax/testsuite-summary-checks.sh
@@ -85,7 +85,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 1eef872..e903cfe 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 50e1057..449ed0f 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 48cfb7f..cf9c3a6 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 501fcc9..12af609 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 1bc4727..4709582 100755
--- a/t/test-driver-cond.sh
+++ b/t/test-driver-cond.sh
@@ -20,7 +20,7 @@
 
 . ./defs || exit 1
 
-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 9d3f28f..55a6b93 100755
--- a/t/test-driver-custom-multitest-recheck.sh
+++ b/t/test-driver-custom-multitest-recheck.sh
@@ -24,7 +24,7 @@
 
 . ./defs || exit 1
 
-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 7f20b81..54fd467 100755
--- a/t/test-driver-custom-multitest-recheck2.sh
+++ b/t/test-driver-custom-multitest-recheck2.sh
@@ -23,7 +23,7 @@
 
 . ./defs || exit 1
 
-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 da8a88f..7a073e2 100755
--- a/t/test-driver-custom-multitest.sh
+++ b/t/test-driver-custom-multitest.sh
@@ -21,7 +21,7 @@
 
 . ./defs || exit 1
 
-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 938c91e..553df50 100755
--- a/t/testsuite-summary-count-many.sh
+++ b/t/testsuite-summary-count-many.sh
@@ -22,7 +22,7 @@
 . ./defs || exit 1
 
 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='============================================================================'


hooks/post-receive
-- 
GNU Automake