diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-04-08 07:28:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-08 07:28:10 -0700 |
| commit | 60e5492743ba2ea3ee9ec839d7ad44f8fb41e6c8 (patch) | |
| tree | d2cc43ed107fbd5a50f4edad6c4d54e4eab24cdb /Makefile | |
| parent | d86729e743fb5a58b9364ee5e991b5db2e9dd600 (diff) | |
| parent | 88b0e74e0bcd651cf00a9bdad3ebedd317330c91 (diff) | |
| download | podman-60e5492743ba2ea3ee9ec839d7ad44f8fb41e6c8.tar.gz podman-60e5492743ba2ea3ee9ec839d7ad44f8fb41e6c8.tar.bz2 podman-60e5492743ba2ea3ee9ec839d7ad44f8fb41e6c8.zip | |
Merge pull request #2841 from openSUSE/ginkgo-unit
Update registrar unit tests to match them of cri-o
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -30,7 +30,6 @@ BASHINSTALLDIR=${PREFIX}/share/bash-completion/completions ZSHINSTALLDIR=${PREFIX}/share/zsh/site-functions SELINUXOPT ?= $(shell test -x /usr/sbin/selinuxenabled && selinuxenabled && echo -Z) -PACKAGES ?= $(shell $(GO) list -tags "${BUILDTAGS}" ./... | grep -v github.com/containers/libpod/vendor | grep -v e2e | grep -v system ) COMMIT_NO ?= $(shell git rev-parse HEAD 2> /dev/null || true) GIT_COMMIT ?= $(if $(shell git status --porcelain --untracked-files=no),${COMMIT_NO}-dirty,${COMMIT_NO}) @@ -172,7 +171,13 @@ testunit: libpodimage ## Run unittest on the built image ${CONTAINER_RUNTIME} run -e STORAGE_OPTIONS="--storage-driver=vfs" -e TESTFLAGS -e CGROUP_MANAGER=cgroupfs -e OCI_RUNTIME -e TRAVIS -t --privileged --rm -v ${CURDIR}:/go/src/${PROJECT} ${LIBPOD_IMAGE} make localunit localunit: test/goecho/goecho varlink_generate - $(GO) test -tags "$(BUILDTAGS)" -cover $(PACKAGES) + ginkgo \ + -r \ + --skipPackage test/e2e,pkg/apparmor \ + --cover \ + --covermode atomic \ + --tags "$(BUILDTAGS)" \ + --succinct $(MAKE) -C contrib/cirrus/packer test ginkgo: |