make: introduce 'test-nonflaky' target

Running this in the root build dir will invoke the test suite to only
run tests not marked as 'flaky'.
This commit is contained in:
Daniel Stenberg 2017-03-22 10:48:20 +01:00
parent 96d6942b2d
commit 207f588987
2 changed files with 10 additions and 1 deletions

View File

@ -193,6 +193,9 @@ test:
test-full: test-full:
@(cd tests; $(MAKE) all full-test) @(cd tests; $(MAKE) all full-test)
test-nonflaky:
@(cd tests; $(MAKE) all nonflaky-test)
test-torture: test-torture:
@(cd tests; $(MAKE) all torture-test) @(cd tests; $(MAKE) all torture-test)

View File

@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___ # | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____| # \___|\___/|_| \_\_____|
# #
# Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. # Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
# #
# This software is licensed as described in the file COPYING, which # This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms # you should have received as part of this distribution. The terms
@ -65,6 +65,9 @@ TEST_Q = -a -s
TEST_AM = -a -am TEST_AM = -a -am
TEST_F = -a -p -r TEST_F = -a -p -r
TEST_T = -a -t TEST_T = -a -t
# !flaky means that it'll skip all tests using the flaky keyword
TEST_NF = -a -p -r !flaky
endif endif
# make sure that PERL is pointing to an executable # make sure that PERL is pointing to an executable
@ -83,6 +86,9 @@ am-test: perlcheck all
full-test: perlcheck all full-test: perlcheck all
$(TEST) $(TEST_F) $(TEST) $(TEST_F)
nonflaky-test: perlcheck all
$(TEST) $(TEST_NF)
torture-test: perlcheck all torture-test: perlcheck all
$(TEST) $(TEST_T) $(TEST) $(TEST_T)