diff options
| author | Sascha Grunert <sgrunert@suse.com> | 2019-04-03 12:32:49 +0200 |
|---|---|---|
| committer | Sascha Grunert <sgrunert@suse.com> | 2019-04-04 08:53:32 +0200 |
| commit | 88b0e74e0bcd651cf00a9bdad3ebedd317330c91 (patch) | |
| tree | b877ea5f97e49a2901f13cc55941be8e8acc8ccd /Makefile | |
| parent | 4bda5378b1434951dbbdf1b6101d662cbf708098 (diff) | |
| download | podman-88b0e74e0bcd651cf00a9bdad3ebedd317330c91.tar.gz podman-88b0e74e0bcd651cf00a9bdad3ebedd317330c91.tar.bz2 podman-88b0e74e0bcd651cf00a9bdad3ebedd317330c91.zip | |
Update registrar unit tests to match them of cri-o
- Add the test framework abstraction
- Update the unit tests to run with ginkgo
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
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: |