3 files changed, 80 insertions, 0 deletions

diff --git a/recipes-containers/cri-o/files/0001-Add-trimpath-to-build-nri.test.patch b/recipes-containers/cri-o/files/0001-Add-trimpath-to-build-nri.test.patch
new file mode 100644
index 00000000..c26e58fd
--- /dev/null
+++ b/recipes-containers/cri-o/files/0001-Add-trimpath-to-build-nri.test.patch
@@ -0,0 +1,28 @@
+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.4+git33d75981bee230f791709975125d7386fe2c530a/src/import/Makefile
+===================================================================
+--- cri-o-1.31.4+git33d75981bee230f791709975125d7386fe2c530a.orig/src/import/Makefile
++++ cri-o-1.31.4+git33d75981bee230f791709975125d7386fe2c530a/src/import/Makefile
+@@ -213,7 +213,7 @@
+        $(GO_BUILD) $(GCFLAGS) $(GO_LDFLAGS) -tags "$(BUILDTAGS)" -o $@ ./test/checkcriu
+ 
+ test/nri/nri.test: $(wildcard test/nri/*.go) ## Build the NRI test binary.
+-       $(GO) test --tags "test $(BUILDTAGS)" -c ./test/nri -o $@
++       $(GO) test --tags "test $(BUILDTAGS)" -c ./test/nri -o $@ ${TRIMPATH}
+ 
+ bin/crio: $(GO_FILES) ## Build the CRI-O main binary.
+        $(GO_BUILD) $(GCFLAGS) $(GO_LDFLAGS) -tags "$(BUILDTAGS)" -o $@ ./cmd/crio
diff --git a/recipes-containers/cri-o/files/0001-Makefile-introduce-GO_TEST-for-more-flexible-configu.patch b/recipes-containers/cri-o/files/0001-Makefile-introduce-GO_TEST-for-more-flexible-configu.patch
new file mode 100644
index 00000000..33c65b5a
--- /dev/null
+++ b/recipes-containers/cri-o/files/0001-Makefile-introduce-GO_TEST-for-more-flexible-configu.patch
@@ -0,0 +1,41 @@
+From 656cb24b07b1e5b63939c15dc31d8c9839ecce75 Mon Sep 17 00:00:00 2001
+From: Chen Qi <Qi.Chen@windriver.com>
+Date: Tue, 14 Jan 2025 20:55:50 -0800
+Subject: [PATCH] Makefile: introduce GO_TEST for more flexible configuration
+
+Introduce GO_TEST and make it similar to GO_BUILD.
+
+Note that with this change, the default behavior changes a little bit,
+that is, TRIMPATH, GCFLAGS and GO_LDFALGS all have effect on test/nri/nri.test.
+
+Upstream-Status: Submitted [https://github.com/cri-o/cri-o/pull/8912]
+
+Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
+---
+ Makefile | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 34f9d429d..f02213894 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,6 +3,7 @@ GO ?= go
+ TRIMPATH ?= -trimpath
+ GO_ARCH=$(shell $(GO) env GOARCH)
+ GO_BUILD ?= $(GO) build $(TRIMPATH)
++GO_TEST ?= $(GO) test $(TRIMPATH)
+ GO_RUN ?= $(GO) run
+ NIX_IMAGE ?= nixos/nix:2.24.3
+ 
+@@ -213,7 +214,7 @@ test/checkcriu/checkcriu: $(GO_FILES) ## Build the checkcriu test binary.
+        $(GO_BUILD) $(GCFLAGS) $(GO_LDFLAGS) -tags "$(BUILDTAGS)" -o $@ ./test/checkcriu
+ 
+ test/nri/nri.test: $(wildcard test/nri/*.go) ## Build the NRI test binary.
+-       $(GO) test --tags "test $(BUILDTAGS)" -c ./test/nri -o $@
++       $(GO_TEST) $(GCFLAGS) $(GO_LDFLAGS) --tags "test $(BUILDTAGS)" -c ./test/nri -o $@
+ 
+ bin/crio: $(GO_FILES) ## Build the CRI-O main binary.
+        $(GO_BUILD) $(GCFLAGS) $(GO_LDFLAGS) -tags "$(BUILDTAGS)" -o $@ ./cmd/crio
+-- 
+2.25.1
+
diff --git a/recipes-containers/cri-o/files/run-ptest b/recipes-containers/cri-o/files/run-ptest
new file mode 100644
index 00000000..62abe959
--- /dev/null
+++ b/recipes-containers/cri-o/files/run-ptest
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+./test/test_runner.sh | while IFS= read -r line; do
+        if [[ $line =~ ^not\ ok ]]; then
+                echo "FAIL: ${line#not ok }"
+        elif [[ $line =~ ^ok && ! $line =~ \#\ skip ]]; then
+                echo "PASS: ${line#ok }"
+        elif [[ $line =~ ^ok.*#\ skip ]]; then
+                echo "SKIP: ${line#ok }"
+        fi
+done