Merge branch 'travis-test-fail'

Run "make failtest" in Travis CI builds. See https://github.com/wxWidgets/wxWidgets/pull/1767
2020-03-24 03:24:00 +01:00
parent ebb6f89e13 98206975f5
commit eb0b4af073
3 changed files with 3 additions and 2 deletions
--- a/build/tools/travis-ci.sh
+++ b/build/tools/travis-ci.sh
@@ -62,6 +62,7 @@ case $wxTOOLSET in
        echo -en 'travis_fold:end:script.build\\r'

        echo 'Building tests...' && echo -en 'travis_fold:start:script.tests\\r'
+        make -C tests $wxJOBS failtest
        make -C tests $wxJOBS
        echo -en 'travis_fold:end:script.tests\\r'

--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1112,7 +1112,7 @@ failtest_weakref:
 	fi; \
 	exit 0

-.PHONY: failtest
+.PHONY: failtest failtest_combobox failtest_evthandler failtest_weakref

 # Include dependency info, if present:
@IF_GNU_MAKE@-include ./.deps/*.d
--- a/tests/test.bkl
+++ b/tests/test.bkl
@@ -376,7 +376,7 @@ failtest_weakref:
 	fi; \
 	exit 0

-.PHONY: failtest
+.PHONY: failtest failtest_combobox failtest_evthandler failtest_weakref
    </fragment>

 </makefile>