mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 12:50:22 +02:00
88949aa04f
The ptest build for cri-o was previously disabled due to issues introduced with Go 1.11, which borken the build process. With the current Go version, these issues no longer occur, and the ptest build is now functional. This commit enables ptest support and resolves the "TMPDIR [buildpaths]" issue encountered during the ptest build process. A total of 382 test cases were executed, with the following results: PASS: 317 FAIL: 33 SKIP: 32 Signed-off-by: Zhang Peng <peng.zhang1.cn@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
From 0bf230f59d211044e7993543e010b0d7f9dcead3 Mon Sep 17 00:00:00 2001
|
|
From: Peng Zhang <peng.zhang1.cn@windriver.com>
|
|
Date: Fri, 25 Oct 2024 10:42:02 +0800
|
|
Subject: [PATCH] Add --trimpath to build nri.test
|
|
|
|
when build test-binary, TMPDIR[buildpaths] error found in nri.test
|
|
to fix this error, add "--trimpath" option to build nri.test.
|
|
|
|
Upstream-Status: Inappropriate [oe specific]
|
|
|
|
Signed-off-by: Peng Zhang <peng.zhang1.cn@windriver.com>
|
|
---
|
|
Makefile | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
Index: cri-o-1.31.0+git20c06a19cb395445620c31730c0f1a0a1922eaae/src/import/Makefile
|
|
===================================================================
|
|
--- cri-o-1.31.0+git20c06a19cb395445620c31730c0f1a0a1922eaae.orig/src/import/Makefile
|
|
+++ cri-o-1.31.0+git20c06a19cb395445620c31730c0f1a0a1922eaae/src/import/Makefile
|
|
@@ -169,7 +169,7 @@ test/checkcriu/checkcriu: $(GO_FILES)
|
|
$(GO_BUILD) $(GCFLAGS) $(GO_LDFLAGS) -tags "$(BUILDTAGS)" -o $@ ./test/checkcriu
|
|
|
|
test/nri/nri.test: $(wildcard test/nri/*.go)
|
|
- $(GO) test --tags "test $(BUILDTAGS)" -c ./test/nri -o $@
|
|
+ $(GO) test --tags "test $(BUILDTAGS)" -c ./test/nri -o $@ ${TRIMPATH}
|
|
|
|
bin/crio: $(GO_FILES)
|
|
$(GO_BUILD) $(GCFLAGS) $(GO_LDFLAGS) -tags "$(BUILDTAGS)" -o $@ ./cmd/crio
|
|
--
|
|
2.34.1
|
|
|