Skip to content

Commit e0fa127

Browse files
committed
Makefile: inline logic for test-integration-local
Get rid of hack/test-integration.sh Signed-off-by: Lokesh Mandvekar <[email protected]>
1 parent dbe914c commit e0fa127

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,11 @@ test-integration:
201201
$(MAKE) test-integration-local
202202

203203

204-
# Intended for CI, assumed to be running in quay.io/libpod/skopeo_cidev container.
204+
# Primarily intended for CI.
205205
test-integration-local: bin/skopeo
206206
hack/warn-destructive-tests.sh
207-
hack/test-integration.sh $(SKOPEO_LDFLAGS) $(TESTFLAGS)
207+
$(MAKE) PREFIX=/usr install
208+
cd ./integration && $(GO) test $(SKOPEO_LDFLAGS) $(TESTFLAGS) $(if $(BUILDTAGS),-tags "$(BUILDTAGS)")
208209

209210
# complicated set of options needed to run podman-in-podman
210211
test-system:

hack/test-integration.sh

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)