diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-03 21:51:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-03 21:51:09 +0200 |
| commit | 0ede794da91329ecc5a24c66924ce84023f237f9 (patch) | |
| tree | 3660d2c1f7939e1e195bd8c6ab8d13edda05e396 /contrib/cirrus/rootless_test.sh | |
| parent | e41162076a2668fa93c61dadaf72d285590c4c6e (diff) | |
| parent | a47bb4d29f0b5e021645a7b755dd882806a536ca (diff) | |
| download | podman-0ede794da91329ecc5a24c66924ce84023f237f9.tar.gz podman-0ede794da91329ecc5a24c66924ce84023f237f9.tar.bz2 podman-0ede794da91329ecc5a24c66924ce84023f237f9.zip | |
Merge pull request #3217 from edsantiago/cirrus_cleanup
cirrus: minor cleanup and refactoring
Diffstat (limited to 'contrib/cirrus/rootless_test.sh')
| -rwxr-xr-x | contrib/cirrus/rootless_test.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/contrib/cirrus/rootless_test.sh b/contrib/cirrus/rootless_test.sh index ef0d05cfd..b5744671b 100755 --- a/contrib/cirrus/rootless_test.sh +++ b/contrib/cirrus/rootless_test.sh @@ -18,6 +18,12 @@ then exit 1 fi +# Which set of tests to run; possible alternative is "system" +TESTSUITE=integration +if [[ -n "$*" ]]; then + TESTSUITE="$1" +fi + # Ensure environment setup correctly req_env_var GOSRC ROOTLESS_USER @@ -34,7 +40,7 @@ make make varlink_generate make test-binaries if [ $remote -eq 0 ]; then - make ginkgo + make local${TESTSUITE} else - make ginkgo-remote + make remote${TESTSUITE} fi |