From 5a96a56c80c95fe1f1873b508858640b98084a2c Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Sun, 7 Jan 2024 11:43:59 -0800 Subject: [PATCH] Fix make test-integration for workspaces --- hack/make-rules/test-integration.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hack/make-rules/test-integration.sh b/hack/make-rules/test-integration.sh index c0bc848b9e8..ad9cd90034c 100755 --- a/hack/make-rules/test-integration.sh +++ b/hack/make-rules/test-integration.sh @@ -46,11 +46,12 @@ KUBE_TEST_VMODULE=${KUBE_TEST_VMODULE:-""} kube::test::find_integration_test_dirs() { ( cd "${KUBE_ROOT}" - find test/integration/ -name '*_test.go' -print0 \ - | xargs -0n1 dirname | sed "s|^|${KUBE_GO_PACKAGE}/|" \ + # The "./" syntax here produces Go-compatible package names. + find ./test/integration/ -name '*_test.go' -print0 \ + | xargs -0n1 dirname \ | LC_ALL=C sort -u - find staging/src/k8s.io/apiextensions-apiserver/test/integration/ -name '*_test.go' -print0 \ - | xargs -0n1 dirname | sed "s|^|${KUBE_GO_PACKAGE}/|" \ + find ./staging/src/k8s.io/apiextensions-apiserver/test/integration/ -name '*_test.go' -print0 \ + | xargs -0n1 dirname \ | LC_ALL=C sort -u ) }