From 04d56c9fe30235c9f99cf816fc6078fa5b2f1512 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Wed, 7 Mar 2018 10:14:17 -0500 Subject: Update test-related makefile targets Signed-off-by: Matthew Heon Closes: #460 Approved by: rhatdan --- Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index aecc05cf1..85a65e3a0 100644 --- a/Makefile +++ b/Makefile @@ -105,8 +105,11 @@ libpodimage: dbuild: libpodimage docker run --name=${LIBPOD_INSTANCE} --privileged ${LIBPOD_IMAGE} -v ${PWD}:/go/src/${PROJECT} --rm make binaries +test: libpodimage + docker run -e STORAGE_OPTIONS="--storage-driver=vfs" -e TESTFLAGS -e TRAVIS -t --privileged --rm -v ${CURDIR}:/go/src/${PROJECT} ${LIBPOD_IMAGE} make clean all localunit localintegration + integration: libpodimage - docker run -e STORAGE_OPTIONS="--storage-driver=vfs" -e TESTFLAGS -e TRAVIS -t --privileged --rm -v ${CURDIR}:/go/src/${PROJECT} ${LIBPOD_IMAGE} make localintegration + docker run -e STORAGE_OPTIONS="--storage-driver=vfs" -e TESTFLAGS -e TRAVIS -t --privileged --rm -v ${CURDIR}:/go/src/${PROJECT} ${LIBPOD_IMAGE} make clean all localintegration integration.fedora: DIST=Fedora sh .papr_prepare.sh @@ -114,7 +117,10 @@ integration.fedora: integration.centos: DIST=CentOS sh .papr_prepare.sh -testunit: +testunit: libpodimage + docker run -e STORAGE_OPTIONS="--storage-driver=vfs" -e TESTFLAGS -e TRAVIS -t --privileged --rm -v ${CURDIR}:/go/src/${PROJECT} ${LIBPOD_IMAGE} make localunit + +localunit: $(GO) test -tags "$(BUILDTAGS)" -cover $(PACKAGES) ginkgo: -- cgit v1.2.3-54-g00ecf