Merge pull request #325 from runcom/tests-in-docker

fix integration tests in docker
This commit is contained in:
Mrunal Patel 2017-01-19 11:44:38 -08:00 committed by GitHub
commit c4673a9136
12 changed files with 64 additions and 199 deletions

View file

@ -52,6 +52,9 @@ bin2img:
copyimg:
make -C test/$@
checkseccomp:
make -C test/$@
ocid:
ifndef GOPATH
$(error GOPATH is not set)
@ -84,6 +87,7 @@ clean:
make -C pause clean
make -C test/bin2img clean
make -C test/copyimg clean
make -C test/checkseccomp clean
ocidimage:
docker build -t ${OCID_IMAGE} .
@ -97,7 +101,7 @@ integration: ocidimage
localintegration: binaries
./test/test_runner.sh ${TESTFLAGS}
binaries: ocid ocic kpod conmon pause bin2img copyimg
binaries: ocid ocic kpod conmon pause bin2img copyimg checkseccomp
MANPAGES_MD := $(wildcard docs/*.md)
MANPAGES := $(MANPAGES_MD:%.md=%)
@ -193,6 +197,7 @@ install.tools: .install.gitvalidation .install.gometalinter .install.md2man
.PHONY: \
bin2img \
binaries \
checkseccomp \
clean \
conmon \
copyimg \