diff --git a/Makefile b/Makefile index 74d64bd8..ebfd2e7a 100644 --- a/Makefile +++ b/Makefile @@ -201,10 +201,11 @@ test-integration: $(MAKE) test-integration-local -# Intended for CI, assumed to be running in quay.io/libpod/skopeo_cidev container. +# Primarily intended for CI. test-integration-local: bin/skopeo hack/warn-destructive-tests.sh - hack/test-integration.sh $(SKOPEO_LDFLAGS) $(TESTFLAGS) + $(MAKE) PREFIX=/usr install + cd ./integration && $(GO) test $(SKOPEO_LDFLAGS) $(TESTFLAGS) $(if $(BUILDTAGS),-tags "$(BUILDTAGS)") # complicated set of options needed to run podman-in-podman test-system: diff --git a/hack/test-integration.sh b/hack/test-integration.sh deleted file mode 100755 index c050b8ad..00000000 --- a/hack/test-integration.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -set -e - -make PREFIX=/usr install - -echo "cd ./integration;" go test "$@" ${BUILDTAGS:+-tags "$BUILDTAGS"} -cd ./integration -go test "$@" ${BUILDTAGS:+-tags "$BUILDTAGS"}