The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=10fb5e7117e522540167fa02692e1e7b8e38eec0
commit 10fb5e7117e522540167fa02692e1e7b8e38eec0
Author: Siva Mahadevan <m...@svmhdvn.name>
AuthorDate: 2025-07-24 20:01:50 +0000
Commit: Li-Wen Hsu <lw...@freebsd.org>
CommitDate: 2025-07-24 20:01:50 +0000
tests/ci: Fix race condition with ci-extractmeta
This solves an issue where 'ci-extractmeta' runs in parallel with
'ci-runtest', which would extract an empty test result into the
final test reports output dir. This also cleans up the intermediate
temporary files created along the way.
Signed-off-by: Siva Mahadevan <m...@svmhdvn.name>
Reviewed by: emaste, lwhsu
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D51363
---
tests/ci/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/ci/Makefile b/tests/ci/Makefile
index b8797e06ac75..ac7faff3afae 100644
--- a/tests/ci/Makefile
+++ b/tests/ci/Makefile
@@ -205,6 +205,7 @@ ci-create-meta: .PHONY
ci-extract-meta: .PHONY
tar xfv ${META_TAR} -C ${META_DIROUT}
+ rm -rf ${META_TAR} ${META_DIR}
@echo "Extracted kyua reports to ${META_DIROUT}"
ci-runtest: ci-buildimage-${TARGET_ARCH:tl} portinstall .PHONY
@@ -254,7 +255,7 @@ ci-checktarget: .PHONY
ci-smoke: ci-set-smoke-var ci-create-meta ci-checktarget .WAIT
ci-runtest-${TARGET_ARCH:tl} .PHONY
-ci-full: ci-set-full-var ci-create-meta ci-checktarget .WAIT
ci-runtest-${TARGET_ARCH:tl} ci-extract-meta .PHONY
+ci-full: ci-set-full-var ci-create-meta ci-checktarget .WAIT
ci-runtest-${TARGET_ARCH:tl} .WAIT ci-extract-meta .PHONY
ci: ci-${CITYPE:tl} .PHONY
