summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2018-06-17 00:05:24 +0200
committerDaniel Stenberg <daniel@haxx.se>2018-06-17 00:05:24 +0200
commitc79670ad1259188777804af3d4e096e2dabe358e (patch)
tree9c79a0ec1217eae6bb54dee57cec102b3caf52dd
parent8e44eb35e3ea87cd55c804cb6fa7e4d5429505ae (diff)
downloadcurl-bagder/travis-more-coverage.tar.gz
fixup remove 1102 (FTP) and remove -r from runtests.pl non-flakybagder/travis-more-coverage
runtests -r doesn't work with -e
-rw-r--r--.travis.yml2
-rw-r--r--tests/Makefile.am4
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 8eb5a2c24..840b41480 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -231,7 +231,7 @@ script:
make
make TFLAGS=-n test-nonflaky
make "TFLAGS=-n -e" test-nonflaky
- tests="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 200 201 202 300 301 302 500 501 502 503 504 506 507 508 509 510 511 512 513 514 515 516 517 518 519 600 601 700 701 702 800 801 802 803 900 901 902 903 1000 1001 1002 1004 1100 1101 1102 1200 1201 1302 1303 1304 1305 1306 1308 1400 1401 1402 1404 1450 1451 1452 1502 1507 1508 1600 1602 1603 1605 1700 1701 1702 2001 3000"
+ tests="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 200 201 202 300 301 302 500 501 502 503 504 506 507 508 509 510 511 512 513 514 515 516 517 518 519 600 601 700 701 702 800 801 802 803 900 901 902 903 1000 1001 1002 1004 1100 1101 1200 1201 1302 1303 1304 1305 1306 1308 1400 1401 1402 1404 1450 1451 1452 1502 1507 1508 1600 1602 1603 1605 1700 1701 1702 2001 3000"
make "TFLAGS=-n -t $tests" test-nonflaky
coveralls --gcov /usr/bin/gcov-7 --gcov-options '\-lp' -i src -e lib -e tests -e docs -b $PWD/src
coveralls --gcov /usr/bin/gcov-7 --gcov-options '\-lp' -e src -i lib -e tests -e docs -b $PWD/lib
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d6e6cfe29..77a9147ea 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2018, 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
@@ -75,7 +75,7 @@ TEST_T = -a -t
TEST_E = -a -e
# !flaky means that it'll skip all tests using the flaky keyword
-TEST_NF = -a -p -r !flaky
+TEST_NF = -a -p !flaky
endif
# make sure that PERL is pointing to an executable