diff options
| author | baude <bbaude@redhat.com> | 2018-01-24 08:45:55 -0600 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-01-29 19:12:20 +0000 |
| commit | dd133a1ad25f75e5ddd53ed6cf59eedfb6838f54 (patch) | |
| tree | cbb5b8d6232340c36519d403704798000203986e /Makefile | |
| parent | 562a5dea57e544717de8d6edb5b0d888299a77ab (diff) | |
| download | podman-dd133a1ad25f75e5ddd53ed6cf59eedfb6838f54.tar.gz podman-dd133a1ad25f75e5ddd53ed6cf59eedfb6838f54.tar.bz2 podman-dd133a1ad25f75e5ddd53ed6cf59eedfb6838f54.zip | |
Initial gingko work
This implements the ginkgo integration test framework for
podman. As tests are migrated from bats to ginkgo, we will
still run both integration suites. When a test is migrated,
we remove the tests from bats at that time. All new tests
should be just for the ginkgo framework.
One exception is that we only run the ginkgo suit in the
travis/ubuntu environment. The CentOS and Fedora PAPR nodes
will more than cover those.
Signed-off-by: baude <bbaude@redhat.com>
Closes: #261
Approved by: baude
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -18,7 +18,7 @@ BASHINSTALLDIR=${PREFIX}/share/bash-completion/completions OCIUMOUNTINSTALLDIR=$(PREFIX)/share/oci-umount/oci-umount.d SELINUXOPT ?= $(shell test -x /usr/sbin/selinuxenabled && selinuxenabled && echo -Z) -PACKAGES ?= $(shell go list -tags "${BUILDTAGS}" ./... | grep -v github.com/projectatomic/libpod/vendor) +PACKAGES ?= $(shell go list -tags "${BUILDTAGS}" ./... | grep -v github.com/projectatomic/libpod/vendor | grep -v e2e) 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}") @@ -110,10 +110,16 @@ dbuild: 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 +integration.fedora: + DIST=Fedora sh .papr_prepare.sh testunit: $(GO) test -tags "$(BUILDTAGS)" -cover $(PACKAGES) +ginkgo: + ginkgo -v test/e2e/ + localintegration: test-binaries + ginkgo -v test/e2e/. bash -i ./test/test_runner.sh ${TESTFLAGS} vagrant-check: |