summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-03-07 10:14:17 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2018-03-08 08:54:32 +0000
commit04d56c9fe30235c9f99cf816fc6078fa5b2f1512 (patch)
treeb0ad568fb9d2c5df296d3eb38e3cbc6b452fd8ab
parent5ac9294a79aa6fa9e91a1a05fd6b3a70b9eb8b8d (diff)
downloadpodman-04d56c9fe30235c9f99cf816fc6078fa5b2f1512.tar.gz
podman-04d56c9fe30235c9f99cf816fc6078fa5b2f1512.tar.bz2
podman-04d56c9fe30235c9f99cf816fc6078fa5b2f1512.zip
Update test-related makefile targets
Signed-off-by: Matthew Heon <matthew.heon@gmail.com> Closes: #460 Approved by: rhatdan
-rwxr-xr-x.papr.sh2
-rw-r--r--.travis.yml4
-rw-r--r--Makefile10
3 files changed, 11 insertions, 5 deletions
diff --git a/.papr.sh b/.papr.sh
index c0bb19ed7..044a7c4a9 100755
--- a/.papr.sh
+++ b/.papr.sh
@@ -13,7 +13,7 @@ export GITVALIDATE_TIP=$(cd $GOSRC; git log -2 --pretty='%H' | tail -n 1)
export TAGS="seccomp $($GOSRC/hack/btrfs_tag.sh) $($GOSRC/hack/libdm_tag.sh) $($GOSRC/hack/btrfs_installed_tag.sh) $($GOSRC/hack/ostree_tag.sh) $($GOSRC/hack/selinux_tag.sh)"
make gofmt TAGS="${TAGS}"
-make testunit TAGS="${TAGS}"
+make localunit TAGS="${TAGS}"
make install.tools TAGS="${TAGS}"
diff --git a/.travis.yml b/.travis.yml
index 138a9c9f9..f1098d885 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,12 +29,12 @@ jobs:
- make lint
go: 1.9.x
- script:
- - make testunit
+ - make localunit
- make
go: 1.8.x
- stage: Build and Verify
script:
- - make testunit
+ - make localunit
- make
go: 1.9.x
- stage: Integration Test
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: