Include hidden tests when counting tests

Author: Thomas Kiley

jbmc/unit/Makefile

@@ -144,8 +144,9 @@ all: $(CATCH_TEST)
 clean: java-testing-utils-clean
 
 test: $(CATCH_TEST)
-	if ! ./$(CATCH_TEST) -l | grep -q "^$(N_CATCH_TESTS) test cases" ; then \
-	  ./$(CATCH_TEST) -l ; fi
+	# Include hidden tests by specifying "*,[.]" for tests to count
+	if ! ./$(CATCH_TEST) "*,[.]" -l | grep -q "^$(N_CATCH_TESTS) matching test cases" ; then \
+	  ./$(CATCH_TEST) "*,[.]" -l ; fi
 	./$(CATCH_TEST) ${TAGS}
 
 

unit/Makefile

@@ -204,8 +204,9 @@ all: $(CATCH_TEST)
 clean: testing-utils-clean
 
 test: $(CATCH_TEST)
-	if ! ./$(CATCH_TEST) -l | grep -q "^$(N_CATCH_TESTS) test cases" ; then \
-		./$(CATCH_TEST) -l ; fi
+	# Include hidden tests by specifying "*,[.]" for tests to count
+	if ! ./$(CATCH_TEST) "*,[.]" -l | grep -q "^$(N_CATCH_TESTS) matching test cases" ; then \
+		./$(CATCH_TEST) "*,[.]" -l ; fi
 	./$(CATCH_TEST) ${TAGS}