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

Update test-related makefile targets 

Signed-off-by: Matthew Heon <matthew.heon@gmail.com>

Closes: #460
Approved by: rhatdan
This commit is contained in:
Matthew Heon 2018-03-07 10:14:17 -05:00 committed by Atomic Bot
parent 5ac9294a79
commit 04d56c9fe3
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.papr.sh
View File

@ -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)" 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 gofmt TAGS="${TAGS}"
make testunit TAGS="${TAGS}" make localunit TAGS="${TAGS}"
make install.tools TAGS="${TAGS}" make install.tools TAGS="${TAGS}"

4
.travis.yml
View File

@ -29,12 +29,12 @@ jobs:
- make lint - make lint
go: 1.9.x go: 1.9.x
- script: - script:
- make testunit - make localunit
- make - make
go: 1.8.x go: 1.8.x
- stage: Build and Verify - stage: Build and Verify
script: script:
- make testunit - make localunit
- make - make
go: 1.9.x go: 1.9.x
- stage: Integration Test - stage: Integration Test

10
Makefile
View File

@ -105,8 +105,11 @@ libpodimage:
dbuild: libpodimage dbuild: libpodimage
docker run --name=${LIBPOD_INSTANCE} --privileged ${LIBPOD_IMAGE} -v ${PWD}:/go/src/${PROJECT} --rm make binaries 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 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: integration.fedora:
DIST=Fedora sh .papr_prepare.sh DIST=Fedora sh .papr_prepare.sh
@ -114,7 +117,10 @@ integration.fedora:
integration.centos: integration.centos:
DIST=CentOS sh .papr_prepare.sh 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) $(GO) test -tags "$(BUILDTAGS)" -cover $(PACKAGES)
ginkgo: ginkgo: