Skip to content
Snippets Groups Projects
Commit 8515b60e authored by dam1n19's avatar dam1n19
Browse files

Fixed Skipped not being written to results file in regression

parent 7c455fc2
No related branches found
No related tags found
No related merge requests found
...@@ -30,7 +30,7 @@ define mti_template ...@@ -30,7 +30,7 @@ define mti_template
mti_$(1): mti_$(1):
@echo Starting Test $(1) @echo Starting Test $(1)
@$$(MAKE) regression_test_mti TESTNAME=$(1) >> /dev/null 2>&1 @$$(MAKE) regression_test_mti TESTNAME=$(1) >> /dev/null 2>&1
@if cat $$(REGRESSION)/$(1).log | grep " TEST PASSED "; then echo "$(1): PASSED" >> $$(REGRESSION)/RESULTS.log; elif cat $$(REGRESSION)/$(1).log | grep " TEST SKIPPED "; then echo "$(1): SKIPPED"; else echo "$(1): FAILED" >> $$(REGRESSION)/RESULTS.log; fi > /dev/null @if cat $$(REGRESSION)/$(1).log | grep " TEST PASSED "; then echo "$(1): PASSED" >> $$(REGRESSION)/RESULTS.log; elif cat $$(REGRESSION)/$(1).log | grep " TEST SKIPPED "; then echo "$(1): SKIPPED" >> $$(REGRESSION)/RESULTS.log; else echo "$(1): FAILED" >> $$(REGRESSION)/RESULTS.log; fi > /dev/null
@echo Finished Test $(1) @echo Finished Test $(1)
endef endef
...@@ -39,7 +39,7 @@ define xm_template ...@@ -39,7 +39,7 @@ define xm_template
xm_$(1): xm_$(1):
@echo Starting Test $(1) @echo Starting Test $(1)
@$$(MAKE) regression_test_xm TESTNAME=$(1) >> /dev/null 2>&1 @$$(MAKE) regression_test_xm TESTNAME=$(1) >> /dev/null 2>&1
@if cat $$(REGRESSION)/$(1).log | grep " TEST PASSED "; then echo "$(1): PASSED" >> $$(REGRESSION)/RESULTS.log; elif cat $$(REGRESSION)/$(1).log | grep " TEST SKIPPED "; then echo "$(1): SKIPPED"; else echo "$(1): FAILED" >> $$(REGRESSION)/RESULTS.log; fi > /dev/null @if cat $$(REGRESSION)/$(1).log | grep " TEST PASSED "; then echo "$(1): PASSED" >> $$(REGRESSION)/RESULTS.log; elif cat $$(REGRESSION)/$(1).log | grep " TEST SKIPPED "; then echo "$(1): SKIPPED" >> $$(REGRESSION)/RESULTS.log; else echo "$(1): FAILED" >> $$(REGRESSION)/RESULTS.log; fi > /dev/null
@echo Finished Test $(1) @echo Finished Test $(1)
endef endef
...@@ -48,7 +48,7 @@ define vcs_template ...@@ -48,7 +48,7 @@ define vcs_template
vcs_$(1): vcs_$(1):
@echo Starting Test $(1) @echo Starting Test $(1)
@$$(MAKE) regression_test_vcs TESTNAME=$(1) >> /dev/null 2>&1 @$$(MAKE) regression_test_vcs TESTNAME=$(1) >> /dev/null 2>&1
@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 @if cat $$(REGRESSION)/$(1).log | grep " TEST PASSED "; then echo "$(1): PASSED" >> $$(REGRESSION)/RESULTS.log; elif cat $$(REGRESSION)/$(1).log | grep " TEST SKIPPED "; then echo "$(1): SKIPPED" >> $$(REGRESSION)/RESULTS.log; else echo "$(1): FAILED" >> $$(REGRESSION)/RESULTS.log; fi > /dev/null
@echo Finished Test $(1) @echo Finished Test $(1)
endef endef
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment