[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12.3-22
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12.3-226-gcbcf500 |
|
Date: |
Wed, 07 Nov 2012 21:33:03 +0000 |
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=cbcf5001c535a05d3262b92465aabfcbe39320e1
The branch, master has been updated
via cbcf5001c535a05d3262b92465aabfcbe39320e1 (commit)
via 93c2c33e04e4e5b78da45ec8c251899acce5d322 (commit)
via dd3fb7edb9639ae5c22c5fc0cfcd8d053f6c1688 (commit)
via 7dbf3d6acb8d3281140cb7958c4937d33e3e53ef (commit)
via bd0d41d77f0d8a24bb8e6aac3bf580cbe741f88e (commit)
via 622358354392072ce81e50ec52377d3bdbf93f22 (commit)
from 153f861b91221d14842c495efa0b1f10d9455855 (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/list-of-tests.mk | 27 ++++-----
t/self-check-shell-no-trail-bslash.sh | 2 +-
t/{silent2.sh => silent-c-gcc.sh} | 2 +-
t/{silent.sh => silent-c-generic.sh} | 52 ++++++++++-------
t/{silent6.sh => silent-custom.sh} | 0
t/{silentcxx-gcc.sh => silent-cxx-gcc.sh} | 2 +-
t/{silentcxx.sh => silent-cxx-generic.sh} | 2 +-
t/{silentf77.sh => silent-f77.sh} | 2 +-
t/{silentf90.sh => silent-f90.sh} | 2 +-
t/{silent7.sh => silent-gen.sh} | 4 +-
t/{silent4.sh => silent-lt-gcc.sh} | 2 +-
t/{silent3.sh => silent-lt-generic.sh} | 55 +++++++++++-------
t/{silent8.sh => silent-texi.sh} | 0
t/silent9.sh | 86 ----------------------------
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 +-
25 files changed, 98 insertions(+), 163 deletions(-)
rename t/{silent2.sh => silent-c-gcc.sh} (96%)
rename t/{silent.sh => silent-c-generic.sh} (64%)
rename t/{silent6.sh => silent-custom.sh} (100%)
rename t/{silentcxx-gcc.sh => silent-cxx-gcc.sh} (97%)
rename t/{silentcxx.sh => silent-cxx-generic.sh} (97%)
rename t/{silentf77.sh => silent-f77.sh} (97%)
rename t/{silentf90.sh => silent-f90.sh} (97%)
rename t/{silent7.sh => silent-gen.sh} (93%)
rename t/{silent4.sh => silent-lt-gcc.sh} (96%)
rename t/{silent3.sh => silent-lt-generic.sh} (63%)
rename t/{silent8.sh => silent-texi.sh} (100%)
delete mode 100755 t/silent9.sh
diff --git a/t/ax/tap-summary-aux.sh b/t/ax/tap-summary-aux.sh
index 6f03b69..d86981f 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 7e65efb..6478705 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 e396e22..c35da0c 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 81440bd..fe2fab2 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/list-of-tests.mk b/t/list-of-tests.mk
index 57d2714..34df7bf 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -966,25 +966,24 @@ t/self-check-is-blocked-signal.tap \
t/self-check-unindent.tap \
t/sanity.sh \
t/seenc.sh \
-t/silent.sh \
-t/silent2.sh \
-t/silent3.sh \
-t/silent4.sh \
-t/silent6.sh \
-t/silent7.sh \
-t/silent8.sh \
-t/silent9.sh \
-t/silentcxx.sh \
-t/silentcxx-gcc.sh \
-t/silentf77.sh \
-t/silentf90.sh \
+t/silent-c-generic.sh \
+t/silent-c-gcc.sh \
+t/silent-lt-generic.sh \
+t/silent-lt-gcc.sh \
+t/silent-gen.sh \
+t/silent-cxx-generic.sh \
+t/silent-cxx-gcc.sh \
+t/silent-f77.sh \
+t/silent-f90.sh \
t/silent-many-gcc.sh \
t/silent-many-generic.sh \
-t/silent-configsite.sh \
-t/silent-nested-vars.sh \
+t/silent-texi.sh \
t/silent-lex.sh \
t/silent-yacc.sh \
t/silent-yacc-headers.sh \
+t/silent-configsite.sh \
+t/silent-nested-vars.sh \
+t/silent-custom.sh \
t/src-acsubst.sh \
t/sourcefile-in-subdir.sh \
t/space.sh \
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/silent2.sh b/t/silent-c-gcc.sh
similarity index 96%
rename from t/silent2.sh
rename to t/silent-c-gcc.sh
index 5dcaa26..3f607b2 100755
--- a/t/silent2.sh
+++ b/t/silent-c-gcc.sh
@@ -17,7 +17,7 @@
# Check silent-rules mode, without libtool, non-fastdep case
# (so that, with GCC, we also cover the other code paths in depend2).
-# Please keep this file in sync with 'silent.sh'.
+# Please keep this file in sync with 'silent-c-generic.sh'.
required=gcc
. test-init.sh
diff --git a/t/silent.sh b/t/silent-c-generic.sh
similarity index 64%
rename from t/silent.sh
rename to t/silent-c-generic.sh
index 32713d5..a241a6c 100755
--- a/t/silent.sh
+++ b/t/silent-c-generic.sh
@@ -16,7 +16,7 @@
# Check silent-rules mode, without libtool, standard depmode case.
-# Please keep this file in sync with 'silent2.sh'.
+# Please keep this file in sync with 'silent-c-gcc.sh'.
required=cc
. test-init.sh
@@ -58,25 +58,35 @@ $ACLOCAL
$AUTOMAKE --add-missing
$AUTOCONF
-./configure --enable-silent-rules
-$MAKE >stdout || { cat stdout; exit 1; }
-cat stdout
-$EGREP ' (-c|-o)' stdout && exit 1
-grep 'mv ' stdout && exit 1
-grep 'CC .*foo\.' stdout
-grep 'CC .*bar\.' stdout
-grep 'CC .*baz\.' stdout
-grep 'CC .*bla\.' stdout
-grep 'CCLD .*foo' stdout
-grep 'CCLD .*bar' stdout
-grep 'CCLD .*baz' stdout
-grep 'CCLD .*bla' stdout
-
-$MAKE clean
-$MAKE V=1 >stdout || { cat stdout; exit 1; }
-cat stdout
-grep ' -c' stdout
-grep ' -o foo' stdout
-$EGREP '(CC|LD) ' stdout && exit 1
+for config_args in \
+ '--enable-dependency-tracking' \
+ '--disable-dependency-tracking' \
+; do
+
+ ./configure --enable-silent-rules $config_args
+
+ $MAKE >stdout || { cat stdout; exit 1; }
+ cat stdout
+ $EGREP ' (-c|-o)' stdout && exit 1
+ grep 'mv ' stdout && exit 1
+ grep 'CC .*foo\.' stdout
+ grep 'CC .*bar\.' stdout
+ grep 'CC .*baz\.' stdout
+ grep 'CC .*bla\.' stdout
+ grep 'CCLD .*foo' stdout
+ grep 'CCLD .*bar' stdout
+ grep 'CCLD .*baz' stdout
+ grep 'CCLD .*bla' stdout
+
+ $MAKE clean
+ $MAKE V=1 >stdout || { cat stdout; exit 1; }
+ cat stdout
+ grep ' -c' stdout
+ grep ' -o foo' stdout
+ $EGREP '(CC|LD) ' stdout && exit 1
+
+ $MAKE distclean
+
+done
:
diff --git a/t/silent6.sh b/t/silent-custom.sh
similarity index 100%
rename from t/silent6.sh
rename to t/silent-custom.sh
diff --git a/t/silentcxx-gcc.sh b/t/silent-cxx-gcc.sh
similarity index 97%
rename from t/silentcxx-gcc.sh
rename to t/silent-cxx-gcc.sh
index f75100a..3994abe 100755
--- a/t/silentcxx-gcc.sh
+++ b/t/silent-cxx-gcc.sh
@@ -16,7 +16,7 @@
# Check silent-rules mode for C++.
# This test requires the GNU C++ compiler; keep it in sync with sister
-# test 'silentcxx.sh', which should work with generic compilers.
+# test 'silent-cxx-generic.sh', which should work with generic compilers.
required=g++
. test-init.sh
diff --git a/t/silentcxx.sh b/t/silent-cxx-generic.sh
similarity index 97%
rename from t/silentcxx.sh
rename to t/silent-cxx-generic.sh
index 0bc4c35..766d3f9 100755
--- a/t/silentcxx.sh
+++ b/t/silent-cxx-generic.sh
@@ -16,7 +16,7 @@
# Check silent-rules mode for C++.
# This test should work with generic C++ compilers; keep it in sync with
-# sister test 'silentcxx-gcc.sh', which requires the GNU C++ compiler
+# sister test 'silent-cxx-gcc.sh', which requires the GNU C++ compiler
# and forces the use of gcc depmode.
required=c++
diff --git a/t/silentf77.sh b/t/silent-f77.sh
similarity index 97%
rename from t/silentf77.sh
rename to t/silent-f77.sh
index f1a423b..24bc937 100755
--- a/t/silentf77.sh
+++ b/t/silent-f77.sh
@@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Check silent-rules mode for Fortran 77.
-# Keep this ins sync with the sister test 'silentf90.sh'.
+# Keep this ins sync with the sister test 'silent-f90.sh'.
required=fortran77
. test-init.sh
diff --git a/t/silentf90.sh b/t/silent-f90.sh
similarity index 97%
rename from t/silentf90.sh
rename to t/silent-f90.sh
index 650d0b6..ef83d80 100755
--- a/t/silentf90.sh
+++ b/t/silent-f90.sh
@@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Check silent-rules mode for Fortran 90.
-# Keep this ins sync with the sister test 'silentf77.sh'.
+# Keep this ins sync with the sister test 'silent-f77.sh'.
required=fortran
. test-init.sh
diff --git a/t/silent7.sh b/t/silent-gen.sh
similarity index 93%
rename from t/silent7.sh
rename to t/silent-gen.sh
index 42e5a83..cd01a4f 100755
--- a/t/silent7.sh
+++ b/t/silent-gen.sh
@@ -14,8 +14,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Check user extensibility of silent-rules mode.
-# Aslo check that silent rules are disabled by default.
+# Silent rules: use of pre-defined variables $(AM_V_GEN) and $(AM_V_at).
+# Incidentally, also check that silent rules are disabled by default.
. test-init.sh
diff --git a/t/silent4.sh b/t/silent-lt-gcc.sh
similarity index 96%
rename from t/silent4.sh
rename to t/silent-lt-gcc.sh
index 28de9e0..f9c9555 100755
--- a/t/silent4.sh
+++ b/t/silent-lt-gcc.sh
@@ -17,7 +17,7 @@
# Check silent-rules mode, with libtool, non-fastdep case
# (so that, with GCC, we also cover the other code paths in depend2).
-# Please keep this file in sync with 'silent3.sh' and 'silent9.sh'.
+# Please keep this file in sync with 'silent-lt-generic.sh'.
required="libtoolize gcc"
. test-init.sh
diff --git a/t/silent3.sh b/t/silent-lt-generic.sh
similarity index 63%
rename from t/silent3.sh
rename to t/silent-lt-generic.sh
index 9c3ed5d..0134603 100755
--- a/t/silent3.sh
+++ b/t/silent-lt-generic.sh
@@ -16,7 +16,7 @@
# Check silent-rules mode, with libtool, standard depmode case.
-# Please keep this file in sync with 'silent4.sh' and 'silent9.sh'.
+# Please keep this file in sync with 'silent-lt-gcc.sh'.
required='cc libtoolize'
. test-init.sh
@@ -61,26 +61,37 @@ $ACLOCAL
$AUTOMAKE --add-missing
$AUTOCONF
-./configure --enable-silent-rules
-$MAKE >stdout || { cat stdout; exit 1; }
-cat stdout
-$EGREP ' (-c|-o)' stdout && exit 1
-grep 'mv ' stdout && exit 1
-grep ' CC .*foo\.' stdout
-grep ' CC .*bar\.' stdout
-grep ' CC .*baz\.' stdout
-grep ' CC .*bla\.' stdout
-grep ' CCLD .*foo' stdout
-grep ' CCLD .*bar' stdout
-grep ' CCLD .*baz' stdout
-grep ' CCLD .*bla' stdout
-
-$MAKE clean
-$MAKE V=1 >stdout || { cat stdout; exit 1; }
-cat stdout
-grep ' -c' stdout
-grep ' -o libfoo' stdout
-# The libtool command line can contain e.g. a '--tag=CC' option.
-sed 's/--tag=[^ ]*/--tag=x/g' stdout | $EGREP '(CC|LD) ' && exit 1
+for config_args in \
+ '--enable-dependency-tracking' \
+ '--disable-dependency-tracking' \
+; do
+
+ ./configure --enable-silent-rules $config_args
+
+ $MAKE >stdout || { cat stdout; exit 1; }
+ cat stdout
+
+ $EGREP ' (-c|-o)' stdout && exit 1
+ grep 'mv ' stdout && exit 1
+ grep ' CC .*foo\.' stdout
+ grep ' CC .*bar\.' stdout
+ grep ' CC .*baz\.' stdout
+ grep ' CC .*bla\.' stdout
+ grep ' CCLD .*foo' stdout
+ grep ' CCLD .*bar' stdout
+ grep ' CCLD .*baz' stdout
+ grep ' CCLD .*bla' stdout
+
+ $MAKE clean
+ $MAKE V=1 >stdout || { cat stdout; exit 1; }
+ cat stdout
+ grep ' -c' stdout
+ grep ' -o libfoo' stdout
+ # The libtool command line can contain e.g. a '--tag=CC' option.
+ sed 's/--tag=[^ ]*/--tag=x/g' stdout | $EGREP '(CC|LD) ' && exit 1
+
+ $MAKE distclean
+
+done
:
diff --git a/t/silent8.sh b/t/silent-texi.sh
similarity index 100%
rename from t/silent8.sh
rename to t/silent-texi.sh
diff --git a/t/silent9.sh b/t/silent9.sh
deleted file mode 100755
index 4ffb4b6..0000000
--- a/t/silent9.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2009-2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Check silent-rules mode, with libtool, nodep case.
-
-# Please keep this file in sync with 'silent3.sh' and 'silent4.sh'.
-
-required='cc libtoolize'
-. test-init.sh
-
-mkdir sub
-
-cat >>configure.ac <<'EOF'
-AC_CONFIG_FILES([sub/Makefile])
-AC_PROG_CC
-AM_PROG_CC_C_O
-AM_PROG_AR
-AC_PROG_LIBTOOL
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
-# Need generic and non-generic rules.
-lib_LTLIBRARIES = libfoo.la libbar.la
-libbar_la_CFLAGS = $(AM_CFLAGS)
-SUBDIRS = sub
-EOF
-
-cat > sub/Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = subdir-objects
-# Need generic and non-generic rules.
-lib_LTLIBRARIES = libbaz.la libbla.la
-libbla_la_CFLAGS = $(AM_CFLAGS)
-EOF
-
-cat > libfoo.c <<'EOF'
-int main ()
-{
- return 0;
-}
-EOF
-cp libfoo.c libbar.c
-cp libfoo.c sub/libbaz.c
-cp libfoo.c sub/libbla.c
-
-libtoolize
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-./configure --disable-dependency-tracking --enable-silent-rules
-$MAKE >stdout || { cat stdout; exit 1; }
-cat stdout
-$EGREP ' (-c|-o)' stdout && exit 1
-grep 'mv ' stdout && exit 1
-grep ' CC .*foo\.' stdout
-grep ' CC .*bar\.' stdout
-grep ' CC .*baz\.' stdout
-grep ' CC .*bla\.' stdout
-grep ' CCLD .*foo' stdout
-grep ' CCLD .*bar' stdout
-grep ' CCLD .*baz' stdout
-grep ' CCLD .*bla' stdout
-
-$MAKE clean
-$MAKE V=1 >stdout || { cat stdout; exit 1; }
-cat stdout
-grep ' -c' stdout
-grep ' -o libfoo' stdout
-# The libtool command line can contain e.g. a '--tag=CC' option.
-sed 's/--tag=[^ ]*/--tag=x/g' stdout | $EGREP '(CC|LD) ' && exit 1
-
-:
diff --git a/t/test-driver-acsubst.sh b/t/test-driver-acsubst.sh
index e8d24ac..076235d 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 a96792d..f2eb8d2 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 99197a5..e27f56f 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 b87d035..d72ebf8 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 b3b7b2a..b68333e 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 866b922..7fee21d 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='============================================================================'
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12.3-226-gcbcf500,
Stefano Lattarini <=