From 625e38c7b7775e559e0191d15dfe71ac3929ef9e Mon Sep 17 00:00:00 2001
From: "marco.bergen" <marco.bergen@eckcellent-it.de>
Date: Mon, 23 Sep 2024 10:41:00 +0200
Subject: [PATCH 1/2] change unittest-report generation from xml to json

---
 build/make/test-unit.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/make/test-unit.mk b/build/make/test-unit.mk
index 6838b1c..1db79d7 100644
--- a/build/make/test-unit.mk
+++ b/build/make/test-unit.mk
@@ -1,7 +1,7 @@
 ##@ Unit testing
 
 UNIT_TEST_DIR=$(TARGET_DIR)/unit-tests
-XUNIT_XML=$(UNIT_TEST_DIR)/unit-tests.xml
+XUNIT_JSON=$(UNIT_TEST_DIR)/report.json
 UNIT_TEST_LOG=$(UNIT_TEST_DIR)/unit-tests.log
 COVERAGE_REPORT=$(UNIT_TEST_DIR)/coverage.out
 
@@ -9,9 +9,9 @@ PRE_UNITTESTS?=
 POST_UNITTESTS?=
 
 .PHONY: unit-test
-unit-test: $(XUNIT_XML) ## Start unit tests
+unit-test: $(XUNIT_JSON) ## Start unit tests
 
-$(XUNIT_XML): $(SRC) $(GO_JUNIT_REPORT)
+$(XUNIT_JSON): $(SRC) $(GO_JUNIT_REPORT)
 ifneq ($(strip $(PRE_UNITTESTS)),)
 	@make $(PRE_UNITTESTS)
 endif
@@ -20,13 +20,13 @@ endif
 	@echo 'mode: set' > ${COVERAGE_REPORT}
 	@rm -f $(UNIT_TEST_LOG) || true
 	@for PKG in $(PACKAGES) ; do \
-    ${GO_CALL} test -v $$PKG -coverprofile=${COVERAGE_REPORT}.tmp 2>&1 | tee $(UNIT_TEST_LOG).tmp ; \
+    ${GO_CALL} test -v $$PKG -coverprofile=${COVERAGE_REPORT}.tmp -json 2>&1 | tee $(UNIT_TEST_LOG).tmp ; \
 		cat ${COVERAGE_REPORT}.tmp | tail +2 >> ${COVERAGE_REPORT} ; \
 		rm -f ${COVERAGE_REPORT}.tmp ; \
 		cat $(UNIT_TEST_LOG).tmp >> $(UNIT_TEST_LOG) ; \
 		rm -f $(UNIT_TEST_LOG).tmp ; \
 	done
-	@cat $(UNIT_TEST_LOG) | $(GO_JUNIT_REPORT) > $@
+	@cat $(UNIT_TEST_LOG) >> $@
 	@if grep '^FAIL' $(UNIT_TEST_LOG); then \
 		exit 1; \
 	fi

From b02de2460cbc203efb4efa9373289fccd8250157 Mon Sep 17 00:00:00 2001
From: "marco.bergen" <marco.bergen-extern@cloudgu.com>
Date: Mon, 7 Oct 2024 09:42:07 +0200
Subject: [PATCH 2/2] use version 2.1.0 of go-junit-reporter to generate
 machine valid xml from json

---
 build/make/test-common.mk | 4 ++--
 build/make/test-unit.mk   | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build/make/test-common.mk b/build/make/test-common.mk
index 6eaa0da..efc0bc7 100644
--- a/build/make/test-common.mk
+++ b/build/make/test-common.mk
@@ -1,6 +1,6 @@
 GO_JUNIT_REPORT=$(UTILITY_BIN_PATH)/go-junit-report
-GO_JUNIT_REPORT_VERSION=v1.0.0
+GO_JUNIT_REPORT_VERSION=v2.1.0
 
 $(GO_JUNIT_REPORT): $(UTILITY_BIN_PATH)
 	@echo "Download go-junit-report..."
-	@$(call go-get-tool,$@,github.com/jstemmer/go-junit-report@$(GO_JUNIT_REPORT_VERSION))
+	@$(call go-get-tool,$@,github.com/jstemmer/go-junit-report/v2@$(GO_JUNIT_REPORT_VERSION))
diff --git a/build/make/test-unit.mk b/build/make/test-unit.mk
index 1db79d7..54a9448 100644
--- a/build/make/test-unit.mk
+++ b/build/make/test-unit.mk
@@ -2,6 +2,7 @@
 
 UNIT_TEST_DIR=$(TARGET_DIR)/unit-tests
 XUNIT_JSON=$(UNIT_TEST_DIR)/report.json
+XUNIT_XML=$(UNIT_TEST_DIR)/unit-tests.xml
 UNIT_TEST_LOG=$(UNIT_TEST_DIR)/unit-tests.log
 COVERAGE_REPORT=$(UNIT_TEST_DIR)/coverage.out
 
@@ -27,6 +28,8 @@ endif
 		rm -f $(UNIT_TEST_LOG).tmp ; \
 	done
 	@cat $(UNIT_TEST_LOG) >> $@
+	@cat $(UNIT_TEST_LOG) | $(GO_JUNIT_REPORT) -parser gojson > $(XUNIT_XML)
+
 	@if grep '^FAIL' $(UNIT_TEST_LOG); then \
 		exit 1; \
 	fi