summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-06-17 22:51:23 +0200
committerGitHub <noreply@github.com>2019-06-17 22:51:23 +0200
commite639a8fa3b8f1f00075f18fffb724601a6c73be1 (patch)
treea1520b95b34faba3ed5eab2fb9f0e5118afd7ee3 /Makefile
parent6ee0f3e99f3df1c45ed6c9e33a1b0de0a06cd560 (diff)
parentd6f436204f0c8c6ef4986c1b8ccff123f300cb34 (diff)
downloadpodman-e639a8fa3b8f1f00075f18fffb724601a6c73be1.tar.gz
podman-e639a8fa3b8f1f00075f18fffb724601a6c73be1.tar.bz2
podman-e639a8fa3b8f1f00075f18fffb724601a6c73be1.zip
Merge pull request #2947 from edsantiago/bats_in_cirrus
run BATS tests in Cirrus
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 764cc0e2c..027f10445 100644
--- a/Makefile
+++ b/Makefile
@@ -220,8 +220,11 @@ localintegration: varlink_generate test-binaries ginkgo
remoteintegration: varlink_generate test-binaries ginkgo-remote
-localsystem: .install.ginkgo
- ginkgo -v -noColor test/system/
+localsystem:
+ if timeout -v 1 true; then PODMAN=./bin/podman bats test/system/; else echo "Skipping localsystem: 'timeout -v' unavailable'"; fi
+
+remotesystem:
+ @echo "remotesystem - unimplemented"
system.test-binary: .install.ginkgo
$(GO) test -c ./test/system