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'.

diff --git a/Makefile.am b/Makefile.am
index 1507a841e11f010fa8f9af550f0f1dd27ad0d16a..fcc5606b0052fca2e9719ca9fdf243d297f40bd1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -193,6 +193,9 @@ test:
 test-full:
        @(cd tests; $(MAKE) all full-test)
 
+test-nonflaky:
+       @(cd tests; $(MAKE) all nonflaky-test)
+
 test-torture:
        @(cd tests; $(MAKE) all torture-test)
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b733e2d57e6377f704fdf0209cc5b2fe465fb413..39cd971454bf4466d2c02fdebbbd71011acb06f1 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -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
 # you should have received as part of this distribution. The terms
@@ -65,6 +65,9 @@ TEST_Q = -a -s
 TEST_AM = -a -am
 TEST_F = -a -p -r
 TEST_T = -a -t
+
+# !flaky means that it'll skip all tests using the flaky keyword
+TEST_NF = -a -p -r !flaky
 endif
 
 # make sure that PERL is pointing to an executable
@@ -83,6 +86,9 @@ am-test: perlcheck all
 full-test: perlcheck all
        $(TEST) $(TEST_F)
 
+nonflaky-test: perlcheck all
+       $(TEST) $(TEST_NF)
+
 torture-test: perlcheck all
        $(TEST) $(TEST_T)