/test-suite.log
/t/wrap/aclocal-1.*
/t/wrap/automake-1.*
-/defs-static
+/t/ax/test-defs.sh
/t/testsuite-part.am
/t/*-w.tap
/t/*-w.sh
t/distcheck-outdated-m4.log: t/ax/distcheck-hook-m4.am
EXTRA_DIST += t/ax/distcheck-hook-m4.am
-defs-static: defs-static.in Makefile
+t/ax/test-defs.sh: t/ax/test-defs.in Makefile
$(AM_V_at)rm -f $@ $@-t
- $(AM_V_GEN)in=defs-static.in\
- && $(do_subst) <$(srcdir)/defs-static.in >$@-t
+ $(AM_V_GEN)in=t/ax/test-defs.in \
+ && $(do_subst) <$(srcdir)/$$in >$@-t
$(generated_file_finalize)
-EXTRA_DIST += defs-static.in
-CLEANFILES += defs-static
-nodist_noinst_DATA = defs-static
+EXTRA_DIST += t/ax/test-defs.in
+CLEANFILES += t/ax/test-defs.sh
+nodist_noinst_DATA = t/ax/test-defs.sh
runtest: runtest.in Makefile
$(AM_V_at)rm -f $@ $@-t
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Source the shell static setup and variable definitions.
-. ./defs-static; test $? -eq 0 || exit 99
+. test-defs.sh; test $? -eq 0 || exit 99
# Source the actual test initialization and setup code, and return
# control to the test script that is sourcing us.
print $file_handle unindent <<EOF;
#! /bin/sh
# This file has been automatically generated. DO NOT EDIT BY HAND!
- . ./defs-static || exit 1
+ . test-defs.sh
$shell_setup_code
# In the spirit of VPATH, we prefer a test in the build tree
# over one in the source tree.
done; \
done | sort)
-xdefs = $(srcdir)/t/ax/test-init.sh $(srcdir)/defs $(srcdir)/defs-static.in
+xdefs = \
+ $(srcdir)/t/ax/test-init.sh \
+ $(srcdir)/t/ax/test-defs.in \
+ $(srcdir)/defs
ams := $(shell find $(srcdir) -name '*.dir' -prune -o -name '*.am' -print)
example, if you need to copy or grep an automake-provided script,
do not assume that they can be found in the '$top_srcdir/lib'
directory, but use '$am_scriptdir' instead. The complete list of
- such "$am_...dir" variables can be found in the 'defs-static.in'
+ such "$am_...dir" variables can be found in the 't/ax/test-defs.in'
file.
* When writing input for lex, include the following in the definitions
# Check that we are running from a proper directory: last thing we want
# is to overwrite some random user files.
-test -f ../../defs-static && test -f ../../defs && test -d ../../t \
+test -f ../../automake && test -f ../../defs && test -d ../../t \
|| fatal_ "running from a wrong directory"
test ! -f Makefile.am || mv Makefile.am Makefile.am~ \
# Tests who want complete control over aclocal or automake command-line
# options should use $am_original_ACLOCAL or $am_original_AUTOMAKE. The
-# "test -z" tests take care not to re-initialize them if defs-static
-# is re-sourced, as we want defs-static to remain really idempotent.
+# "test -z" tests take care not to re-initialize them if 'test-defs.sh'
+# is re-sourced, as we want that file to remain really idempotent.
if test -z "$am_original_AUTOMAKE"; then
am_original_AUTOMAKE=${AM_TESTSUITE_AUTOMAKE-${AUTOMAKE-"automake-$APIVERSION"}}
fi
esac
# Make our helper script accessible by default.
+# The '$am_testauxdir' should be defined in the environment of
+# our testsuite.
PATH=$am_testauxdir$PATH_SEPARATOR$PATH
export PATH
## --------------------- ##
# Ensure $am_top_srcdir is set correctly.
-test -f "$am_top_srcdir/defs-static.in" || {
- echo "$me: $am_top_srcdir/defs-static.in not found," \
+test -f "$am_top_srcdir/automake.in" || {
+ echo "$me: $am_top_srcdir/automake.in not found," \
"check \$am_top_srcdir" >&2
exit 99
}
# Ensure $am_top_builddir is set correctly.
-test -f "$am_top_builddir/defs-static" || {
- echo "$me: $am_top_builddir/defs-static not found," \
+test -f "$am_top_builddir/automake" || {
+ echo "$me: $am_top_builddir/automake not found," \
"check \$am_top_builddir" >&2
exit 99
}
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Sanity check for the automake testsuite.
-# Make sure that $am_using_tap gets automatically defined by
-# './defs-static', but can be overridden by the individual tests.
+# Make sure that '$am_using_tap' gets automatically defined by
+# 'test-defs.sh', but can be overridden by the individual tests.
-. ./defs-static || exit 1
+. test-defs.sh
set -ex
$AM_TEST_RUNNER_SHELL -c \
- '. ./defs-static && test $am_using_tap = yes' foo.tap
+ ". test-defs.sh && test \$am_using_tap = yes" foo.tap
for name in foo.test tap tap.test foo-tap; do
$AM_TEST_RUNNER_SHELL -c \
- '. ./defs-static && test $am_using_tap = no' $name
+ ". test-defs.sh && test \$am_using_tap = no" $name
done
-$AM_TEST_RUNNER_SHELL -c '
+$AM_TEST_RUNNER_SHELL -c "
am_using_tap=no
- . ./defs-static
- test $am_using_tap = no
-' foo.tap
+ . test-defs.sh
+ test \$am_using_tap = no
+" foo.tap
-$AM_TEST_RUNNER_SHELL -c '
+$AM_TEST_RUNNER_SHELL -c "
am_using_tap=yes
- . ./defs-static
- test $am_using_tap = yes
-' foo.test
+ . test-defs.sh
+ test \$am_using_tap = yes
+" foo.test
:
# TAP support:
# - colorized testsuite summary
-. ./defs-static
+. test-defs.sh
use_colors=yes
. "$am_testauxdir"/tap-summary-aux.sh
# TAP support:
# - colorized testsuite summary
-. ./defs-static
+. test-defs.sh
use_colors=no
. "$am_testauxdir"/tap-summary-aux.sh
# Check coloring of the testsuite summary.
-. ./defs-static || exit 1
+. test-defs.sh
use_colors=yes
use_vpath=no
# Check test counts in the testsuite summary.
-. ./defs-static || exit 1
+. test-defs.sh
use_colors=no
use_vpath=no