diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2012-11-23 11:56:26 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2012-11-23 11:56:26 +0100 |
| commit | 14dc679ce0b9018ebe1bc7d0356b7869747ecd96 (patch) | |
| tree | c19dab6af73c59a69b60a281fd41f0abd278c1d4 /tests/Makefile.am | |
| parent | ef6f0403556afecc0a595915e016e7889eef0eb8 (diff) | |
test: offer "automake" output and check for perl better
runtests.pl -am now uses the "PASS/FAIL: [desc]" output for each
executed test. You can run 'make test-am' in the root build directory to
invoke that. The reason for this output style is to better allow generic
test suite parsers to also grok our test output.
The test Makefile now also tests that perl was indeed found and that the
PERL variable points to an executable before it tries to run the main
test perl script runtests.pl,
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 42f89dcea..d8c3e18ab 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -55,26 +55,31 @@ curl: if CROSSCOMPILING TEST = @echo "NOTICE: we can't run the tests when cross-compiling!" -TEST_Q = -TEST_F = -TEST_T = else # if not cross-compiling: TEST = srcdir=$(srcdir) $(PERL) $(PERLFLAGS) $(srcdir)/runtests.pl TEST_Q = -a -s +TEST_AM = -a -am TEST_F = -a -p -r TEST_T = -a -t endif -test: all +# make sure that PERL is pointing to an executable +perlcheck: + @if ! test -x "$(PERL)"; then echo "No perl!"; exit 2; fi + +test: perhcheck all $(TEST) -quiet-test: all +quiet-test: perlcheck all $(TEST) $(TEST_Q) -full-test: all +am-test: perlcheck all + $(TEST) $(TEST_AM) + +full-test: perlcheck all $(TEST) $(TEST_F) -torture-test: all +torture-test: perlcheck all $(TEST) $(TEST_T) .1.html: |