mirror of
https://github.com/containers/skopeo.git
synced 2025-09-01 14:47:10 +00:00
Makefile: inline logic for test-integration-local
Get rid of hack/test-integration.sh Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
This commit is contained in:
5
Makefile
5
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:
|
||||
|
@@ -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"}
|
Reference in New Issue
Block a user