diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-23 15:31:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-23 15:31:02 -0400 |
| commit | 0d961a40ba40b3fbd69090c49ee3cec7151f8a8e (patch) | |
| tree | cf726cb2aa427d330f568977987f55810f1f49ab /Makefile | |
| parent | aa6881dd1474506610a85926f58893efe67eb98d (diff) | |
| parent | aa16a0aab1576cc8ea21d7407ff64b597e79f10c (diff) | |
| download | podman-0d961a40ba40b3fbd69090c49ee3cec7151f8a8e.tar.gz podman-0d961a40ba40b3fbd69090c49ee3cec7151f8a8e.tar.bz2 podman-0d961a40ba40b3fbd69090c49ee3cec7151f8a8e.zip | |
Merge pull request #6726 from edsantiago/bats
system tests: invoke with abs path to podman
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -351,7 +351,7 @@ remoteintegration: varlink_generate test-binaries ginkgo-remote localsystem: # Wipe existing config, database, and cache: start with clean slate. $(RM) -rf ${HOME}/.local/share/containers ${HOME}/.config/containers - if timeout -v 1 true; then PODMAN=./bin/podman bats test/system/; else echo "Skipping $@: 'timeout -v' unavailable'"; fi + if timeout -v 1 true; then PODMAN=$(shell pwd)/bin/podman bats test/system/; else echo "Skipping $@: 'timeout -v' unavailable'"; fi .PHONY: remotesystem remotesystem: @@ -378,7 +378,7 @@ remotesystem: echo "Error: ./bin/podman system service did not come up on $$SOCK_FILE" >&2;\ exit 1;\ fi;\ - env PODMAN="./bin/podman-remote --url $$PODMAN_SOCKET" bats test/system/ ;\ + env PODMAN="$(shell pwd)/bin/podman-remote --url $$PODMAN_SOCKET" bats test/system/ ;\ rc=$$?;\ kill %1;\ rm -f $$SOCK_FILE;\ |