From 8515b60e7b4567448fc719f5905113d4ebfcca29 Mon Sep 17 00:00:00 2001 From: dam1n19 <dam1n19@soton.ac.uk> Date: Thu, 6 Jul 2023 09:33:40 +0100 Subject: [PATCH] Fixed Skipped not being written to results file in regression --- flows/makefile.regression | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flows/makefile.regression b/flows/makefile.regression index 75d5d90..a40ce59 100644 --- a/flows/makefile.regression +++ b/flows/makefile.regression @@ -30,7 +30,7 @@ define mti_template mti_$(1): @echo Starting Test $(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) endef @@ -39,7 +39,7 @@ define xm_template xm_$(1): @echo Starting Test $(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) endef @@ -48,7 +48,7 @@ define vcs_template vcs_$(1): @echo Starting Test $(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) endef -- GitLab