github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-06-21 12:29:32 +00:00
Code Issues Projects Releases Wiki Activity

Fix skipping tests in test container

Browse Source 
Without this env. var. being set from hack/make.sh, many/most
integration tests will `SKIP`.  Fix this by notifying the user
and setting the magic `SKOPEO_CONTAINER_TESTS` variable.

Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich 2021-03-09 09:34:02 -05:00 committed by Valentin Rothberg
parent 3d1d2978d7
commit f5a028e4d9
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -31,6 +31,10 @@ ifeq ($(GOBIN),)
GOBIN := $(GOPATH)/bin GOBIN := $(GOPATH)/bin
endif endif
# Required for integration-tests to detect they are running inside a specific
# container image. Env. var defined in image, make does not automatically
# pass to children unless explicitly exported
export container_magic
CONTAINER_RUNTIME := $(shell command -v podman 2> /dev/null || echo docker) CONTAINER_RUNTIME := $(shell command -v podman 2> /dev/null || echo docker)
GOMD2MAN ?= $(shell command -v go-md2man || echo '$(GOBIN)/go-md2man') GOMD2MAN ?= $(shell command -v go-md2man || echo '$(GOBIN)/go-md2man')

3
hack/make.sh
View File

@ -35,6 +35,9 @@ if [[ "$container_magic" != "85531765-346b-4316-bdb8-358e4cca9e5d" ]]; then
echo "# Try this instead: make all" echo "# Try this instead: make all"
echo "#" echo "#"
} >&2 } >&2
else
echo "# I appear to be running inside my designated container image, good!"
export SKOPEO_CONTAINER_TESTS=1
fi fi
echo echo