This is just a preparatory change in view of a future commit.
* t/ax/test-defs.in: Here.
* t/ax/tap-summary-aux.sh: And here.
* t/ax/testsuite-summary-checks.sh: And here.
* t/distcheck-missing-m4.sh: And here.
* t/distcheck-outdated-m4.sh: And here.
* t/self-check-shell-no-trail-bslash.sh: And here.
* t/test-driver-acsubst.sh: And here.
* t/test-driver-cond.sh: And here.
* t/test-driver-custom-multitest.sh: And here.
* t/test-driver-custom-multitest-recheck.sh: And here.
* t/test-driver-custom-multitest-recheck2.sh: And here.
* t/testsuite-summary-count-many.sh: And here.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
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
# 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
# Support for the "installcheck" target.
case ${am_running_installcheck:=no} in
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
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'
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'
@echo $(am__backslash)
END
-SHELL=$am_testauxdir/shell-no-trail-bslash
+SHELL=$am_testaux_srcdir/shell-no-trail-bslash
$SHELL -c 'exit 0'
test "$($SHELL -c 'echo is o\k')" = "is ok"
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"
. ./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"
. ./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'
. ./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'
. ./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'
. ./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='============================================================================'