containers
/
image
mirror of https://github.com/containers/image.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

makefile: pass BUILDTAGS to test-skopeo 

Since skopeo now also has containers/storage we have to pass it our
BUILDTAGS otherwise you'll get build failures in the CI.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
This commit is contained in:
Aleksa Sarai 2016-12-21 18:07:20 +11:00
parent d0a45e907a
commit 136fb03dea
No known key found for this signature in database
GPG Key ID: 9E18AA267DDB8DB4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -5,7 +5,8 @@ SKOPEO_REPO = projectatomic/skopeo
SKOPEO_BRANCH = master SKOPEO_BRANCH = master
# Set SUDO=sudo to run container integration tests using sudo. # Set SUDO=sudo to run container integration tests using sudo.
SUDO = SUDO =
BUILDFLAGS = -tags "btrfs_noversion libdm_no_deferred_remove" BUILDTAGS = btrfs_noversion libdm_no_deferred_remove
BUILDFLAGS := -tags "$(BUILDTAGS)"
all: deps .gitvalidation test validate all: deps .gitvalidation test validate
@ -30,7 +31,7 @@ test-skopeo:
git clone -b $(SKOPEO_BRANCH) https://github.com/$(SKOPEO_REPO) $${skopeo_path} && \ git clone -b $(SKOPEO_BRANCH) https://github.com/$(SKOPEO_REPO) $${skopeo_path} && \
rm -rf $${vendor_path} && cp -r . $${vendor_path} && \ rm -rf $${vendor_path} && cp -r . $${vendor_path} && \
cd $${skopeo_path} && \ cd $${skopeo_path} && \
make binary-local test-all-local && \ make BUILDTAGS="$(BUILDTAGS)" binary-local test-all-local && \
$(SUDO) make check && \ $(SUDO) make check && \
rm -rf $${skopeo_path} rm -rf $${skopeo_path}