diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | runtest.in (renamed from t/ax/runtest.in) | 0 | ||||
| -rw-r--r-- | t/README | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore index 4eec957ad..b7eee5c4f 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ /configure.lineno /aclocal /automake +/runtest /doc/.dirstamp /doc/automake*.info /doc/automake*.info-[0-9] @@ -37,7 +38,6 @@ /t/wrap/automake-1.* /defs-static /t/testsuite-part.am -/t/ax/runtest /t/*-w.tap /t/*-w.sh /t/depcomp-*.tap diff --git a/Makefile.am b/Makefile.am index 9ef2f48c4..276448158 100644 --- a/Makefile.am +++ b/Makefile.am @@ -400,16 +400,16 @@ defs-static: defs-static.in Makefile EXTRA_DIST += defs-static.in CLEANFILES += defs-static -t/ax/runtest: t/ax/runtest.in Makefile +runtest: runtest.in Makefile $(AM_V_at)rm -f $@ $@-t - $(AM_V_GEN)in=t/ax/runtest.in \ + $(AM_V_GEN)in=runtest.in \ && $(MKDIR_P) t/ax \ - && $(do_subst) <$(srcdir)/t/ax/runtest.in >$@-t \ + && $(do_subst) <$(srcdir)/runtest.in >$@-t \ && chmod a+x $@-t $(generated_file_finalize) -EXTRA_DIST += t/ax/runtest.in -CLEANFILES += t/ax/runtest -noinst_SCRIPTS = t/ax/runtest +EXTRA_DIST += runtest.in +CLEANFILES += runtest +noinst_SCRIPTS = runtest # If two test scripts have the same basename, they will end up sharing # the same log file, leading to all sort of undefined and undesired diff --git a/t/ax/runtest.in b/runtest.in index 31f8e012c..31f8e012c 100644 --- a/t/ax/runtest.in +++ b/runtest.in @@ -73,10 +73,10 @@ About the tests with the '.tap' suffix use the TAP protocol. If you want to run a test by hand, you should be able to do so using the - 'runtest' script: + 'runtest' script provided in the Automake distribution: - ./t/ax/runtest t/nogzip.sh - ./t/ax/runtest t/add-missing.tap + ./runtest t/nogzip.sh + ./runtest t/add-missing.tap This will run the test using the correct shell, and should also work in VPATH builds. Note that, to run the TAP tests this way, you'll need to |