From 7696fa1bb709d42ddf3790d44004f393f6b7299f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 24 Mar 2020 00:01:15 +0100 Subject: [PATCH 1/2] Mark failtest_xxx targets as phony This doesn't really change anything, but is more correct, as the targets names don't correspond to any physical files. --- tests/Makefile.in | 2 +- tests/test.bkl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.in b/tests/Makefile.in index 6ac5346604..04f937e5db 100644 --- 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 diff --git a/tests/test.bkl b/tests/test.bkl index 3349de542d..e1bf5e0ec5 100644 --- 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 From 98206975f5672095aa02806ed62a2a417aaaeae6 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 24 Mar 2020 00:02:38 +0100 Subject: [PATCH 2/2] Run compilation failures tests on Travis "failtest" target is not built by default and it's not trivial to change this, as it needs to be built before anything else (and not in parallel with it, as otherwise object files created while building the tests could be removed), so just build it manually before building the tests themselves in Travis CI builds (or at least those of them using configure and make). --- build/tools/travis-ci.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build/tools/travis-ci.sh b/build/tools/travis-ci.sh index 85d7d6c2dc..3d88b54116 100755 --- 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'