From ddf73b7990d8127d4389978eace1213edfd365d1 Mon Sep 17 00:00:00 2001
From: dam1n19 <dam1n19@soton.ac.uk>
Date: Fri, 30 Jun 2023 21:32:44 +0100
Subject: [PATCH] Updated Regression flow to support skipped tests

---
 makefile | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/makefile b/makefile
index 23e891d..dd2c041 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
-- 
GitLab