maj/StorytellersBestFriend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Outputs the error count when running tests.

Browse Source 
Outputs a summary of failure messages after running tests.
This commit is contained in:
Tom Hicks
2023-04-15 16:26:46 -07:00
parent 3751d78dfe
commit 31a5b60f7f
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Makefile
View File

@@ -127,16 +127,24 @@ $(TEST_MAIN_CPP): $(TEST_OBJECTS)
@echo "#include <string>" >> $(TEST_MAIN_CPP)
@echo "#include <iostream>" >> $(TEST_MAIN_CPP)
@echo "#include <tuple>" >> $(TEST_MAIN_CPP)
@echo "#include <algorithm>" >> $(TEST_MAIN_CPP)
@echo "#include <vector>" >> $(TEST_MAIN_CPP)
@echo "using namespace Test;" >> $(TEST_MAIN_CPP)
@echo "using std::cout;\nusing std::endl;\nusing std::tuple;\nusing std::get;" >> $(TEST_MAIN_CPP)
@echo "using std::cout;\nusing std::endl;\nusing std::tuple;\nusing std::get;\nusing std::for_each;\nusing std::vector;" >> $(TEST_MAIN_CPP)
@echo "$(patsubst %, extern TestResults main_test_%(int argc, char** argv);\n, $(MODULES))" >> $(TEST_MAIN_CPP)
@echo "int main(int argc, char** argv) {\n setlocale(LC_ALL, \"\");\n TestResults results;\n" >> $(TEST_MAIN_CPP)
@echo "$(patsubst %, results += main_test_%(argc, argv);\n, $(MODULES))" >> $(TEST_MAIN_CPP)
@echo " auto failure_messages = results.failure_messages();" >> $(TEST_MAIN_CPP)
@echo " if (failure_messages.size() > 0) {" >> $(TEST_MAIN_CPP)
@echo " cout << \"Failures:\" << endl;" >> $(TEST_MAIN_CPP)
@echo " for_each(failure_messages.begin(), failure_messages.end(), [](const string& message){cout << message << endl;});\n" >> $(TEST_MAIN_CPP)
@ehco " }" >> $(TEST_MAIN_CPP)
@echo " cout << \"Total tests: \" << results.total() << endl;" >> $(TEST_MAIN_CPP)
@echo " cout << \"Passed: \" << results.passed() << endl;" >> $(TEST_MAIN_CPP)
@echo " cout << \"Failed: \" << results.failed() << endl;" >> $(TEST_MAIN_CPP)
@echo " cout << \"Skipped: \" << results.skipped() << endl;" >> $(TEST_MAIN_CPP)
@echo "\n return 0;\n}" >> $(TEST_MAIN_CPP)
@echo " cout << \"Errors: \" << results.errors() << endl;" >> $(TEST_MAIN_CPP)
@echo "\n return 0;\n}\n//tom2" >> $(TEST_MAIN_CPP)
# We make our own fat libs cause homebrew sucks. # We may have to do something similar for macports, but that's not supported yet.
$(LIB_DIR)/lib%.a: $(BREW_PREFIX)/opt/$$*/lib/lib$$*.a $(BREW86_PREFIX)/opt/$$*/lib/lib$$*.a $(MANDATORY_TARGETS)
@@ -150,7 +158,6 @@ run_test: $(TEST_HARNESS_APP) $(MANDATORY_TARGETS)
$(TEST_HARNESS_APP)
$(TEST_HARNESS_CPP): $(MANDATORY_TARGETS)
@echo "//stuff " >> $(TEST_HARNESS_CPP)
@echo "// This file is auto generated\n" > $(TEST_HARNESS_CPP)
@echo "#include \"$(RELATIVE_SRC_DIR)/$(MODULE).h\"" >> $(TEST_HARNESS_CPP)
@echo "#include \"../sbf-cpp/test.h\"" >> $(TEST_HARNESS_CPP)
@@ -159,14 +166,24 @@ $(TEST_HARNESS_CPP): $(MANDATORY_TARGETS)
@echo "#include <string>" >> $(TEST_HARNESS_CPP)
@echo "#include <iostream>" >> $(TEST_HARNESS_CPP)
@echo "#include <tuple>" >> $(TEST_HARNESS_CPP)
@echo "#include <algorithm>" >> $(TEST_HARNESS_CPP)
@echo "#include <vector>" >> $(TEST_HARNESS_CPP)
@echo "using namespace Test;" >> $(TEST_HARNESS_CPP)
@echo "using std::cout;\nusing std::endl;\nusing std::tuple;\nusing std::get;" >> $(TEST_HARNESS_CPP)
@echo "using std::cout;\nusing std::endl;\nusing std::tuple;\nusing std::get;\nusing std::for_each;\nusing std::vector;" >> $(TEST_HARNESS_CPP)
@echo "extern TestResults main_test_$(MODULE)(int argc, char** argv);" >> $(TEST_HARNESS_CPP)
@echo "int main(int argc, char** argv) {\n setlocale(LC_ALL, \"\");\n TestResults results;\n" >> $(TEST_HARNESS_CPP)
@echo " results = results + main_test_$(MODULE)(argc, argv);\n" >> $(TEST_HARNESS_CPP)
@echo " cout << \"Total tests ran: \" << get<0>(results) << endl;" >> $(TEST_HARNESS_CPP)
@echo " cout << \"Total failures: \" << get<1>(results) << endl;" >> $(TEST_HARNESS_CPP)
@echo "\n return 0;\n}" >> $(TEST_HARNESS_CPP)
@echo " auto failure_messages = results.failure_messages();" >> $(TEST_HARNESS_CPP)
@echo " if (failure_messages.size() > 0) {" >> $(TEST_HARNESS_CPP)
@echo " cout << \"Failures:\" << endl;" >> $(TEST_HARNESS_CPP)
@echo " for_each(failure_messages.begin(), failure_messages.end(), [](const string& message){cout << message << endl;});\n" >> $(TEST_HARNESS_CPP)
@echo " }" >> $(TEST_HARNESS_CPP)
@echo " cout << \"Total tests: \" << results.total() << endl;" >> $(TEST_HARNESS_CPP)
@echo " cout << \"Passed: \" << results.passed() << endl;" >> $(TEST_HARNESS_CPP)
@echo " cout << \"Failed: \" << results.failed() << endl;" >> $(TEST_HARNESS_CPP)
@echo " cout << \"Skipped: \" << results.skipped() << endl;" >> $(TEST_HARNESS_CPP)
@echo " cout << \"Errors: \" << results.errors() << endl;" >> $(TEST_HARNESS_CPP)
@echo "\n return 0;\n}\n//tom" >> $(TEST_HARNESS_CPP)
$(TEST_HARNESS_OBJ): $(TEST_HARNESS_CPP) $(SRC_DIR)/*.h $(TEST_CPP) $(MANDATORY_TARGETS)
$(CC) $(CCFLAGS) -c -o $@ $<