diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-07-06 23:42:11 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-07-06 23:42:11 +0200 |
| commit | 5197aba1d5e1895c28d66703b0b407c991f608fb (patch) | |
| tree | 3798c0afed811366ec4474da85c55d6c89e3097f | |
| parent | 2d1f1043e900a746f57c34467d4de8b48e4efc8b (diff) | |
| download | automake-5197aba1d5e1895c28d66703b0b407c991f608fb.tar.gz | |
cosmetics: rename t/ax/test-runner => t/ax/runtest
The latter is shorter and clearer. Better to do the rename early,
before other developers or contributors begin to get used to the
'test-runner' name.
* t/ax/test-runner.in: Rename ...
* t/ax/runtest.in: ... like this.
* Makefile.am, t/README, .gitignore: Adjust.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | t/README | 8 | ||||
| -rw-r--r-- | t/ax/runtest.in (renamed from t/ax/test-runner.in) | 0 |
4 files changed, 11 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore index 2b9edacf9..4eec957ad 100644 --- a/.gitignore +++ b/.gitignore @@ -37,7 +37,7 @@ /t/wrap/automake-1.* /defs-static /t/testsuite-part.am -/t/ax/test-runner +/t/ax/runtest /t/*-w.tap /t/*-w.sh /t/depcomp-*.tap diff --git a/Makefile.am b/Makefile.am index 7169eee01..9ef2f48c4 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/test-runner: t/ax/test-runner.in Makefile +t/ax/runtest: t/ax/runtest.in Makefile $(AM_V_at)rm -f $@ $@-t - $(AM_V_GEN)in=t/ax/test-runner.in \ + $(AM_V_GEN)in=t/ax/runtest.in \ && $(MKDIR_P) t/ax \ - && $(do_subst) <$(srcdir)/t/ax/test-runner.in >$@-t \ + && $(do_subst) <$(srcdir)/t/ax/runtest.in >$@-t \ && chmod a+x $@-t $(generated_file_finalize) -EXTRA_DIST += t/ax/test-runner.in -CLEANFILES += t/ax/test-runner -noinst_SCRIPTS = t/ax/test-runner +EXTRA_DIST += t/ax/runtest.in +CLEANFILES += t/ax/runtest +noinst_SCRIPTS = t/ax/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 @@ -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 - 'test-runner' script: + 'runtest' script: - ./t/ax/test-runner t/nogzip.sh - ./t/ax/test-runner t/add-missing.tap + ./t/ax/runtest t/nogzip.sh + ./t/ax/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 @@ -95,7 +95,7 @@ Supported shells AM_TEST_RUNNER_SHELL=/bin/my-sh make -e check (non-GNU make) # Run a test directly from the command line. - AM_TEST_RUNNER_SHELL=/bin/my-sh ./t/ax/test-runner t/foo.sh + AM_TEST_RUNNER_SHELL=/bin/my-sh ./t/ax/runtest t/foo.sh The test scripts are written with portability in mind, and should run diff --git a/t/ax/test-runner.in b/t/ax/runtest.in index 31f8e012c..31f8e012c 100644 --- a/t/ax/test-runner.in +++ b/t/ax/runtest.in |