mirror of
https://github.com/containers/podman.git
synced 2025-07-01 16:17:06 +08:00
e2e and bindings tests: fix $PATH setup
Both tests need the podman-registry script in $PATH, this never worked locally as only the cirrus specific CI setup scripts configured this. To make it work correctly locally add the hack dir to $PATH for these Makefile targets. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
4
Makefile
4
Makefile
@ -620,6 +620,8 @@ localunit: test/goecho/goecho test/version/version
|
||||
test: localunit localintegration remoteintegration localsystem remotesystem ## Run unit, integration, and system tests.
|
||||
|
||||
.PHONY: ginkgo-run
|
||||
# e2e tests need access to podman-registry
|
||||
ginkgo-run: PATH := $(PATH):$(CURDIR)/hack
|
||||
ginkgo-run: .install.ginkgo
|
||||
$(GINKGO) version
|
||||
$(GINKGO) -vv $(TESTFLAGS) --tags "$(TAGS) remote" $(GINKGOTIMEOUT) --flake-attempts $(GINKGO_FLAKE_ATTEMPTS) \
|
||||
@ -636,6 +638,8 @@ ginkgo-remote:
|
||||
$(MAKE) ginkgo-run TAGS="$(REMOTETAGS) remote_testing"
|
||||
|
||||
.PHONY: testbindings
|
||||
# bindings tests need access to podman-registry
|
||||
testbindings: PATH := $(PATH):$(CURDIR)/hack
|
||||
testbindings: .install.ginkgo
|
||||
$(GINKGO) -v $(TESTFLAGS) --tags "$(TAGS) remote" $(GINKGOTIMEOUT) --trace --no-color --timeout 30m -v -r ./pkg/bindings/test
|
||||
|
||||
|
@ -88,9 +88,6 @@ function _run_bindings() {
|
||||
# install ginkgo
|
||||
showrun make .install.ginkgo
|
||||
|
||||
# shellcheck disable=SC2155
|
||||
export PATH=$PATH:$GOSRC/hack:$GOSRC/test/tools/build
|
||||
|
||||
# if logformatter sees this, it can link directly to failing source lines
|
||||
local gitcommit_magic=
|
||||
if [[ -n "$GIT_COMMIT" ]]; then
|
||||
|
@ -38,8 +38,6 @@ do
|
||||
fi
|
||||
done
|
||||
|
||||
cp hack/podman-registry /bin
|
||||
|
||||
# Bypass git safety/security checks when operating in a throwaway environment
|
||||
showrun git config --global --add safe.directory $GOSRC
|
||||
|
||||
|
Reference in New Issue
Block a user