* tests/defs-static.in ($am_testauxdir): New variable.
* tests/testsuite-summary-checks.sh: Moved ...
* tests/ax/testsuite-summary-checks.sh: ... here.
* tests/trivial-test-driver: Moved ...
* tests/ax/trivial-test-driver: ... here.
* tests/tap-summary-aux.sh: Moved ...
* tests/ax/tap-summary-aux.sh: ... here.
* tests/distcheck-hook-m4.am: Moved ...
* tests/ax/distcheck-hook-m4.am: ... here.
* tests/prove-runner: Moved ...
* tests/ax/prove-runner: ... here.
* tests/depcomp.sh: Moved ...
* tests/ax/depcomp.sh: ... here.
* tests/tap-setup.sh: Moved ...
* tests/ax/tap-setup.sh: ... here.
* tests/tap-functions.sh: Moved ...
* tests/ax/tap-functions.sh: ... here.
* tests/plain-functions.sh: Moved ...
* tests/ax/plain-functions.sh: ... here.
* tests/extract-testsuite-summary: Moved ...
* tests/ax/extract-testsuite-summary.pl: .. . here.
* tests/gen-testsuite-part: Adjusted accordingly.
* tests/Makefile.am: Likewise.
* tests/defs: Likewise.
* syntax-check.mk: Likewise.
* Several tests: Likewise.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
for s in test tap sh; do \
ls $$d/tests/*.$$s 2>/dev/null; \
done; \
+ ls $$d/tests/ax/*.sh 2>/dev/null; \
done | sort)
ams := $(shell find $(srcdir) -name '*.am')
# Static dependencies valid for each test case.
check_SCRIPTS = wrap/aclocal-$(APIVERSION) wrap/automake-$(APIVERSION)
-check_DATA = defs defs-static plain-functions.sh tap-functions.sh
-EXTRA_DIST += tap-functions.sh plain-functions.sh
+check_DATA = defs defs-static
+dist_check_DATA = ax/plain-functions.sh ax/tap-functions.sh
# Few more static dependencies.
-distcheck-missing-m4.log distcheck-outdated-m4.log: distcheck-hook-m4.am
-EXTRA_DIST += distcheck-hook-m4.am
+distcheck-missing-m4.log: ax/distcheck-hook-m4.am
+distcheck-outdated-m4.log: ax/distcheck-hook-m4.am
+EXTRA_DIST += ax/distcheck-hook-m4.am
# Keep in sync with AC_SUBST'd stuff in defs-static.in.
do_subst = sed \
test -z "$$tests" || \
{ \
$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) \
- $(PROVE) $(AM_PROVEFLAGS) -e $(srcdir)/prove-runner $(PROVEFLAGS) \
+ $(PROVE) $(AM_PROVEFLAGS) -e $(srcdir)/ax/prove-runner $(PROVEFLAGS) \
$$tests $(AM_TESTS_FD_REDIRECT); \
}
-EXTRA_DIST += prove-runner
+EXTRA_DIST += ax/prove-runner
.PHONY: prove installprove
-prove installprove: $(TESTS) prove-runner defs-static
+prove installprove: $(TESTS) ax/prove-runner defs-static
@exit_status=0; \
## The testsuite can be run either using the automake build tree or
## the already-installed automake package.
else
test $st -eq 0 || Exit 1
fi
- $PERL -w "$testsrcdir"/extract-testsuite-summary stdout > summary.got \
+ $PERL "$am_testauxdir"/extract-testsuite-summary.pl stdout >summary.got \
|| fatal_ "cannot extract testsuite summary"
cat summary.exp
cat summary.got
else
test $st -eq 0 || Exit 1
fi
- $PERL -w "$testsrcdir"/extract-testsuite-summary stdout > summary.got \
+ $PERL "$am_testauxdir"/extract-testsuite-summary.pl stdout >summary.got \
|| fatal_ "cannot extract testsuite summary"
cat summary.exp
cat summary.got
am_funcs_file=plain-functions.sh
fi
-if test -f "$testsrcdir/$am_funcs_file"; then
- . "$testsrcdir/$am_funcs_file" || {
+if test -f "$am_testauxdir/$am_funcs_file"; then
+ . "$am_testauxdir/$am_funcs_file" || {
echo "$me: error sourcing $testsrcdir/$am_funcs_file" >&2
Exit 99
}
else
- echo "$me: $testsrcdir/$am_funcs_file not found, check \$testsrcdir" >&2
+ echo "$me: $am_testauxdir/$am_funcs_file not found" >&2
Exit 99
fi
unset am_funcs_file
top_testbuilddir='@abs_top_builddir@'
testprefix='@prefix@'
+# Where testsuite-related helper scripts, data files and shell libraries
+# are placed.
+am_testauxdir=$testsrcdir/ax
+
# Support for the "installcheck" target.
case ${am_running_installcheck:=no} in
yes)
cwd=`pwd` || fatal_ "cannot get current working directory"
-cp "$testsrcdir"/distcheck-hook-m4.am . \
+cp "$am_testauxdir"/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 "$testsrcdir"/distcheck-hook-m4.am . \
+cp "$am_testauxdir"/distcheck-hook-m4.am . \
|| fatal_ "cannot fetch makefile fragment 'distcheck-hook-m4.am'"
cat > Makefile.am << 'END'
#--------------------------------------------------------------------------
+# Where testsuite-related helper scripts, data files and shell libraries
+# are placed. Relative to the 'tests/' subdirectory.
+my $auxdir = "ax";
+
my %deps_extractor =
(
libtool_macros =>
use_trivial_test_driver =>
{
line_matcher => qr/\btrivial-test-driver\b/,
- dist_prereqs => "trivial-test-driver",
+ dist_prereqs => "$auxdir/trivial-test-driver",
},
check_testsuite_summary =>
{
line_matcher => qr/\btestsuite-summary-checks\.sh\b/,
- dist_prereqs => "testsuite-summary-checks.sh",
+ dist_prereqs => "$auxdir/testsuite-summary-checks.sh",
},
extract_testsuite_summary =>
{
- line_matcher => qr/\bextract-testsuite-summary\b/,
- dist_prereqs => "extract-testsuite-summary",
+ line_matcher => qr/\bextract-testsuite-summary\.pl\b/,
+ dist_prereqs => "$auxdir/extract-testsuite-summary.pl",
},
check_tap_testsuite_summary =>
{
line_matcher => qr/\btap-summary-aux\.sh\b/,
- dist_prereqs => "tap-summary-aux.sh",
+ dist_prereqs => "$auxdir/tap-summary-aux.sh",
},
on_tap_with_common_setup =>
{
line_matcher => qr/\btap-setup\.sh\b/,
- dist_prereqs => "tap-setup.sh",
+ dist_prereqs => "$auxdir/tap-setup.sh",
nodist_prereqs => "tap-common-setup.log",
},
depcomp =>
{
line_matcher => qr/\bdepcomp\.sh\b/,
- dist_prereqs => "depcomp.sh",
+ dist_prereqs => "$auxdir/depcomp.sh",
},
);
required="@required"
. ./defs || Exit 1
plan_ $planned
- . "\$testsrcdir/depcomp.sh"; exit "\$?"
+ . "\$am_testauxdir/depcomp.sh"; exit "\$?"
EOF
},
0555);
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<END
1..6
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<'END'
1..14
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<END
First line
am_tap_implementation=shell
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > a.test <<END
1..1
TESTS = $tests
END
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > exit.test << 'END'
#!/bin/sh
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
echo AM_TEST_LOG_DRIVER_FLAGS = --comments >> Makefile
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
# Various errors that can all be squashed into a single test script.
cat > foo.test << 'END'
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
: > exp
few.test many.test order.test afterlate.test
END
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test << 'END'
1..5
c.log: b.log
END
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > a.test << 'END'
#!/bin/sh
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
metacharacters=\''"\$!&()[]<>#;^?*'
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
sed 's/\$$//' > all.test <<END
1..1$
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
# Empty TAP input.
: > empty.test
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<'END'
1..8
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<'END'
1..2
chmod a+x *.test
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
$MAKE check >stdout && { cat stdout; Exit 1; }
cat stdout
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
#
# From manpage Test::Harness::TAP(3):
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
#
# From manpage Test::Harness::TAP(3):
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > ok.test << 'END'
1..5
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > ok.test <<END
1..3
TEST_SUITE_LOG = global.log
END
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
# Custom markers, for use in grepping checks.
cmarker=::: # comment marker
TESTS = all.test
END
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<END
#!/bin/sh
chmod a+x foo.test
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
$MAKE check >stdout && { cat stdout; Exit 1; }
cat stdout
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
echo 'Bail out! 0' > a.test
echo 'Bail out! 0.0' > b.test
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test << 'END'
1..3
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test << 'END'
1..14
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
echo '1..0 # SKIP 0' > a.test
echo '1..0 # SKIP 0.0' > b.test
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test << 'END'
1..10
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<'END'
1..7
TESTS = bail.test few.test noplan.test
END
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > bail.test <<END
1..1
TESTS = all.test
END
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<END
#!/bin/sh
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > prefixes <<'END'
A
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<'END'
1..1
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
echo 1..5 > all.test
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<'END'
1..4
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<'END'
1..5
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
do_checks ()
{
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
# Some random numbers to be used as test names. The definitions below are
# selected so that $x<n> != <n> for every n >= 1. We can't use positional
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > a.test <<END
1..3
echo TESTS += exit-$e.test >> Makefile.am
done
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
st=0
$MAKE check || st=$?
weirdchars=\''"\$@!&()[]<>#;,:.^?*/'
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
#
# Only successful tests.
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
# -------------------------------------------------------------------------
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
my_check ()
{
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > a.test <<END
1..01
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > a.test <<END
1..1 foo
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > top1.test <<END
non-TAP line, ignored
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
sed 's/\$$//' > foo.test <<END
1..2 $
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > top.test <<END
1..3
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
echo TEST_LOG_DRIVER_FLAGS = --comments >> Makefile
echo TESTS = one.test two.test > Makefile.am
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > one.test <<'END'
#!/bin/sh
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<END
1..0 # SKIP
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
# These nested loops are clearer without indentation.
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > foo.test <<END
some non-TAP text, will be copied in the global log
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<END
1..0
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > foo.test <<END
1..0 # SKIP
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<END
ok 1
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > foo.test <<END
1..0${tab}${tab} #${tab}SKIP ${tab}Strip leading & trailing ${tab}${tab}
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
weirdchars=\''"$!&()[]<>#;^?*/@%=,.:'
cat > Makefile.am << 'END'
TESTS = all.test
END
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<'END'
#! /bin/sh
baz.log: zardoz
END
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
: > zardoz
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<END
1..5
. ./defs-static
use_colors=yes
-. "$testsrcdir"/tap-summary-aux.sh
+. "$am_testauxdir"/tap-summary-aux.sh
. ./defs-static
use_colors=no
-. "$testsrcdir"/tap-summary-aux.sh
+. "$am_testauxdir"/tap-summary-aux.sh
fi
fi
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > a.test <<END
1..1
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<END
1..2
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > stub.tap <<END
1 # TODO
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
# ----------------------------------------------------- #
# Check all possible combinations of: #
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<END
1..1
chmod a+x *.test
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
# Don't care about exit status or number of test results, they should be
# checked for in many other tests.
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
cat > all.test <<'END'
1..7
am_parallel_tests=yes
. ./defs || Exit 1
-. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
echo 'XFAIL_TESTS = $(TESTS)' >> Makefile
mkdir test-drivers
-cp "$testsrcdir"/trivial-test-driver test-drivers/triv \
+cp "$am_testauxdir"/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"
am_parallel_tests=yes
. ./defs || Exit 1
-cp "$testsrcdir"/trivial-test-driver . \
+cp "$am_testauxdir"/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"
am_parallel_tests=yes
. ./defs || Exit 1
-cp "$testsrcdir"/trivial-test-driver . \
+cp "$am_testauxdir"/trivial-test-driver . \
|| fatal_ "failed to fetch auxiliary script trivial-test-driver"
cat >> configure.ac << 'END'
am_parallel_tests=yes
. ./defs || Exit 1
-cp "$testsrcdir"/trivial-test-driver . \
+cp "$am_testauxdir"/trivial-test-driver . \
|| fatal_ "failed to fetch auxiliary script trivial-test-driver"
cat >> configure.ac << 'END'
am_parallel_tests=yes
. ./defs || Exit 1
-cp "$testsrcdir"/trivial-test-driver . \
+cp "$am_testauxdir"/trivial-test-driver . \
|| fatal_ "failed to fetch auxiliary script trivial-test-driver"
cat >> configure.ac << 'END'
use_colors=yes
use_vpath=no
-. "$testsrcdir"/testsuite-summary-checks.sh || Exit 99
+. "$am_testauxdir"/testsuite-summary-checks.sh || Exit 99
./configure
am_parallel_tests=yes
. ./defs || Exit 1
-for s in trivial-test-driver extract-testsuite-summary; do
- cp "$testsrcdir/$s" . || fatal_ "failed to fetch auxiliary script $s"
+for s in trivial-test-driver extract-testsuite-summary.pl; do
+ cp "$am_testauxdir/$s" . || fatal_ "failed to fetch auxiliary script $s"
done
br='============================================================================'
($MAKE check || : > make.fail) | tee stdout
test -f make.fail
-$PERL -w extract-testsuite-summary stdout > summary.got
+$PERL extract-testsuite-summary.pl stdout > summary.got
cat summary.exp
cat summary.got
diff summary.exp summary.got || Exit 1
use_colors=no
use_vpath=no
-. "$testsrcdir"/testsuite-summary-checks.sh || Exit 99
+. "$am_testauxdir"/testsuite-summary-checks.sh || Exit 99
./configure