diff --git a/makefile b/makefile index 23e891d4c7210f71bad3b9bb63baad6b8203f594..dd2c041138fbf568f49257dfb2e7e89f1c392a6f 100644 --- a/makefile +++ b/makefile @@ -183,25 +183,28 @@ TEST_LIST_VCS = $(shell cat $(TEST_LIST_FILE) | while read line || [ -n "$$line" define mti_template .PHONY: $(1) mti_$(1): - @echo Running test $(1) + @echo Starting Test $(1) @timeout $(TIMEOUT) $(MAKE) -j1 run_mti TESTNAME=$(1) > $$(REGRESSION)/$(1).log - @if cat $$(REGRESSION)/$(1).log | grep -i "Test Passed"; then echo "$(1): PASSED" >> $$(REGRESSION)/RESULTS.log; else echo "$(1): FAILED" >> $$(REGRESSION)/RESULTS.log; fi > /dev/null + @if cat $$(REGRESSION)/$(1).log | grep -i "Test Passed"; then echo "$(1): PASSED" >> $$(REGRESSION)/RESULTS.log; elif cat $$(REGRESSION)/$(1).log | grep -i "Test Skipped"; then echo "$(1): SKIPPED"; else echo "$(1): FAILED" >> $$(REGRESSION)/RESULTS.log; fi > /dev/null + @echo Finished Test $(1) endef define xm_template .PHONY: $(1) xm_$(1): - @echo Running test $(1) + @echo Starting Test $(1) @timeout $(TIMEOUT) @$(MAKE) -j1 run_xm TESTNAME=$(1) > $$(REGRESSION)/$(1).log - @if cat $$(REGRESSION)/$(1).log | grep -i "Test Passed"; then echo "$(1): PASSED" >> $$(REGRESSION)/RESULTS.log; else echo "$(1): FAILED" >> $$(REGRESSION)/RESULTS.log; fi > /dev/null + @if cat $$(REGRESSION)/$(1).log | grep -i "Test Passed"; then echo "$(1): PASSED" >> $$(REGRESSION)/RESULTS.log; elif cat $$(REGRESSION)/$(1).log | grep -i "Test Skipped"; then echo "$(1): SKIPPED"; else echo "$(1): FAILED" >> $$(REGRESSION)/RESULTS.log; fi > /dev/null + @echo Finished Test $(1) endef define vcs_template .PHONY: $(1) vcs_$(1): - @echo Running test $(1) + @echo Starting Test $(1) @timeout $(TIMEOUT) @$(MAKE) -j1 run_vcs TESTNAME=$(1) > $$(REGRESSION)/$(1).log - @if cat $$(REGRESSION)/$(1).log | grep -i "Test Passed"; then echo "$(1): PASSED" >> $$(REGRESSION)/RESULTS.log; else echo "$(1): FAILED" >> $$(REGRESSION)/RESULTS.log; fi > /dev/null + @if cat $$(REGRESSION)/$(1).log | grep -i "Test Passed"; then echo "$(1): PASSED" >> $$(REGRESSION)/RESULTS.log; elif cat $$(REGRESSION)/$(1).log | grep -i "Test Skipped"; then echo "$(1): SKIPPED"; else echo "$(1): FAILED" >> $$(REGRESSION)/RESULTS.log; fi > /dev/null + @echo Finished Test $(1) endef # Generate Targets from Templates using Test List