From 0885ed58fd15e77d0c6b6fbdce12441e19ec5c3b Mon Sep 17 00:00:00 2001 From: Koji Hasegawa Date: Mon, 23 Sep 2024 11:58:11 +0900 Subject: [PATCH 1/2] Mod log file names to same to game-ci/unity-test-runner --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 419bee5..92386d3 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ endef define base_arguments -projectPath $(PROJECT_HOME) \ - -logFile $(LOG_DIR)/test_$(TEST_PLATFORM).log + -logFile $(LOG_DIR)/$(TEST_PLATFORM).log endef define test_arguments @@ -37,7 +37,7 @@ define test_arguments -runTests \ -testCategory "!IgnoreCI" \ -testPlatform $(TEST_PLATFORM) \ - -testResults $(LOG_DIR)/test_$(TEST_PLATFORM)_results.xml \ + -testResults $(LOG_DIR)/$(TEST_PLATFORM)-results.xml \ -testHelperScreenshotDirectory $(LOG_DIR)/Screenshots endef From 1a315ae70a7deb75d6188255f8d0dcb609b07af2 Mon Sep 17 00:00:00 2001 From: Koji Hasegawa Date: Mon, 23 Sep 2024 15:28:44 +0900 Subject: [PATCH 2/2] Fix to code coverage exclude test project assemblies --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 92386d3..9bdb226 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ PACKAGE_NAME?=$(shell grep -o -E '"name": "(.+)"' $(PACKAGE_HOME)/package.json | # Code Coverage report filter (comma separated) # see: https://docs.unity3d.com/Packages/com.unity.testtools.codecoverage@1.2/manual/CoverageBatchmode.html -PACKAGE_ASSEMBLIES?=$(shell echo $(shell find $(PACKAGE_HOME) -name "*.asmdef" -maxdepth 3 | sed -e s/.*\\//\+/ | sed -e s/\\.asmdef// | sed -e s/^.*\\.Tests//) | sed -e s/\ /,/g) +PACKAGE_ASSEMBLIES?=$(shell echo $(shell find $(PACKAGE_HOME) -name "*.asmdef" | grep -v -E "\/UnityProject~\/" | sed -e s/.*\\//\+/ | sed -e s/\\.asmdef// | sed -e s/^.*\\.Tests//) | sed -e s/\ /,/g) COVERAGE_ASSEMBLY_FILTERS?=$(PACKAGE_ASSEMBLIES),+,-*.Tests UNAME := $(shell uname)