mirror of
https://github.com/containers/skopeo.git
synced 2025-09-01 22:58:24 +00:00
Makefile: test-system-local checks for SKOPEO_BINARY
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
This commit is contained in:
3
Makefile
3
Makefile
@@ -220,8 +220,7 @@ test-system:
|
|||||||
exit $$rc
|
exit $$rc
|
||||||
|
|
||||||
# Intended for CI, assumed to already be running in quay.io/libpod/skopeo_cidev container.
|
# Intended for CI, assumed to already be running in quay.io/libpod/skopeo_cidev container.
|
||||||
test-system-local: bin/skopeo
|
test-system-local: $(if $(SKOPEO_BINARY),,bin/skopeo)
|
||||||
hack/warn-destructive-tests.sh
|
|
||||||
hack/test-system.sh
|
hack/test-system.sh
|
||||||
|
|
||||||
test-unit:
|
test-unit:
|
||||||
|
@@ -37,8 +37,12 @@ EOF
|
|||||||
export CONTAINERS_STORAGE_CONF=/etc/containers/storage.conf
|
export CONTAINERS_STORAGE_CONF=/etc/containers/storage.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Build skopeo, install into /usr/bin
|
# Print what binary is being used for tests
|
||||||
make PREFIX=/usr install
|
if [[ -v SKOPEO_BINARY ]]; then
|
||||||
|
echo "Testing with $SKOPEO_BINARY ..."
|
||||||
|
else
|
||||||
|
echo "Testing with $(git rev-parse --show-toplevel)/bin/skopeo ..."
|
||||||
|
fi
|
||||||
|
|
||||||
# Run tests
|
# The skopeo binary will be at ../bin/skopeo unless set via SKOPEO_BINARY var
|
||||||
SKOPEO_BINARY=/usr/bin/skopeo bats --tap systemtest
|
bats --tap systemtest
|
||||||
|
Reference in New Issue
Block a user