removed references to nonexistent tests

This commit is contained in:
Noah Campbell
2025-10-13 12:45:59 -05:00
parent 45ee61aa4d
commit bf1dfa0318
3 changed files with 8 additions and 8 deletions

View File

@@ -115,7 +115,7 @@ jobs:
if [ -s /tmp/preflight-tests.txt ]; then
regex="$(grep -v '^$' /tmp/preflight-tests.txt | tr '\n' '|' | sed 's/|$//')"
if [ -n "$regex" ]; then
RUN="^(${regex})$" make preflight-e2e-go-only-test
RUN="^(${regex})$" make support-bundle-e2e-go-test
else
echo "No valid preflight tests matched after filtering"
fi
@@ -130,7 +130,7 @@ jobs:
if [ -s /tmp/support-tests.txt ]; then
regex="$(grep -v '^$' /tmp/support-tests.txt | tr '\n' '|' | sed 's/|$//')"
if [ -n "$regex" ]; then
RUN="^(${regex})$" make support-bundle-e2e-go-only-test
RUN="^(${regex})$" make support-bundle-e2e-go-test
else
echo "No valid support-bundle tests matched after filtering"
fi

View File

@@ -49,8 +49,8 @@ ffi: fmt vet
.PHONY: test
test: generate fmt vet
if [ -n $(RUN) ]; then \
go test ${BUILDFLAGS} ${BUILDPATHS} ${TESTFLAGS} -run $(RUN); \
if [ -n "$(RUN)" ]; then \
go test ${BUILDFLAGS} ${BUILDPATHS} ${TESTFLAGS} -run "$(RUN)"; \
else \
go test ${BUILDFLAGS} ${BUILDPATHS} ${TESTFLAGS}; \
fi
@@ -86,8 +86,8 @@ support-bundle-e2e-test:
.PHONY: support-bundle-e2e-go-test
support-bundle-e2e-go-test:
if [ -n $(RUN) ]; then \
go test ${BUILDFLAGS} ${E2EPATHS} -v -run $(RUN); \
if [ -n "$(RUN)" ]; then \
go test ${BUILDFLAGS} ${E2EPATHS} -v -run "$(RUN)"; \
else \
go test ${BUILDFLAGS} ${E2EPATHS} -v; \
fi

View File

@@ -55,9 +55,9 @@ BUILD_TAGS='netgo containers_image_ostree_stub exclude_graphdriver_devicemapper
if [ -n "${PRE}" ]; then
echo "Running preflight e2e: ${PRE}"
go test -tags "${BUILD_TAGS}" -installsuffix netgo -v -count=1 ./test/e2e/preflight -run "^(("${PRE}")$)" || true
go test -tags "${BUILD_TAGS}" -installsuffix netgo -v -count=1 ./test/e2e/preflight -run "^(${PRE})$" || true
fi
if [ -n "${SB}" ]; then
echo "Running support-bundle e2e: ${SB}"
go test -tags "${BUILD_TAGS}" -installsuffix netgo -v -count=1 ./test/e2e/support-bundle -run "^(("${SB}")$)" || true
go test -tags "${BUILD_TAGS}" -installsuffix netgo -v -count=1 ./test/e2e/support-bundle -run "^(${SB})$" || true
fi