Running expected failure tests after running regular unit tests

This ensures that failed tests don't get inadvertently fixed, without
cluttering the normal output

Author: thk123

.travis.yml

@@ -355,9 +355,13 @@ script:
   - env PATH=$PATH:`pwd`/src/solvers UBSAN_OPTIONS=print_stacktrace=1 make -C regression/cbmc test-cprover-smt2
   - make -C unit "CXX=${COMPILER} ${EXTRA_CXXFLAGS}" -j2
   - make -C unit test
+  - echo "Running expected failure tests"
+  - make TAGS="[!shouldfail]" -C unit test
   - env UBSAN_OPTIONS=print_stacktrace=1 make -C jbmc/regression test-parallel "CXX=${COMPILER} ${EXTRA_CXXFLAGS}" -j2 JOBS=2
   - make -C jbmc/unit "CXX=${COMPILER} ${EXTRA_CXXFLAGS}" -j2
   - make -C jbmc/unit test
+  - echo "Running expected failure tests"
+  - make TAGS="[!shouldfail]" -C jbmc/unit test
 
 before_cache:
   - ccache -s

jbmc/unit/Makefile

@@ -146,7 +146,7 @@ clean: java-testing-utils-clean
 test: $(CATCH_TEST)
 	if ! ./$(CATCH_TEST) -l | grep -q "^$(N_CATCH_TESTS) test cases" ; then \
 	  ./$(CATCH_TEST) -l ; fi
-	./$(CATCH_TEST)
+	./$(CATCH_TEST) ${TAGS}
 
 
 ###############################################################################

unit/Makefile

@@ -206,7 +206,7 @@ clean: testing-utils-clean
 test: $(CATCH_TEST)
 	if ! ./$(CATCH_TEST) -l | grep -q "^$(N_CATCH_TESTS) test cases" ; then \
 		./$(CATCH_TEST) -l ; fi
-	./$(CATCH_TEST)
+	./$(CATCH_TEST) ${TAGS}
 
 
 ###############################################################################