diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-10 13:19:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-10 13:19:44 -0400 |
| commit | c44992827d7e5d6ab84317a49340f34734c13ec5 (patch) | |
| tree | 2f3236b21d28e2408d800cd5fcd983f491f0ec77 /contrib/cirrus/rootless_test.sh | |
| parent | 6c5bd152648c86ff6ecc2777b94bbc9059783bbe (diff) | |
| parent | 15f273b9310399ba048f667dba40f553b2fb60cb (diff) | |
| download | podman-c44992827d7e5d6ab84317a49340f34734c13ec5.tar.gz podman-c44992827d7e5d6ab84317a49340f34734c13ec5.tar.bz2 podman-c44992827d7e5d6ab84317a49340f34734c13ec5.zip | |
Merge pull request #6530 from edsantiago/test_podman_remote
Enable, then partially disable, podman-remote testing
Diffstat (limited to 'contrib/cirrus/rootless_test.sh')
| -rwxr-xr-x | contrib/cirrus/rootless_test.sh | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/contrib/cirrus/rootless_test.sh b/contrib/cirrus/rootless_test.sh index 3f45aac84..9e1b1d911 100755 --- a/contrib/cirrus/rootless_test.sh +++ b/contrib/cirrus/rootless_test.sh @@ -2,14 +2,6 @@ set -e -remote=0 - -# The TEST_REMOTE_CLIENT environment variable decides whether -# to test varlink -if [[ "$TEST_REMOTE_CLIENT" == "true" ]]; then - remote=1 -fi - source $(dirname $0)/lib.sh if [[ "$UID" == "0" ]] @@ -18,11 +10,8 @@ then exit 1 fi -# Which set of tests to run; possible alternative is "system" -TESTSUITE=integration -if [[ -n "$*" ]]; then - TESTSUITE="$1" -fi +TESTSUITE=${1?Missing TESTSUITE argument (arg1)} +LOCAL_OR_REMOTE=${2?Missing LOCAL_OR_REMOTE argument (arg2)} # Ensure environment setup correctly req_env_var GOSRC ROOTLESS_USER @@ -31,7 +20,6 @@ echo "." echo "Hello, my name is $USER and I live in $PWD can I be your friend?" echo "." -export PODMAN_VARLINK_ADDRESS=unix:/tmp/podman-$(id -u) show_env_vars set -x @@ -39,8 +27,4 @@ cd "$GOSRC" make make varlink_generate make test-binaries -if [ $remote -eq 0 ]; then - make local${TESTSUITE} -else - make remote${TESTSUITE} -fi +make ${LOCAL_OR_REMOTE}${TESTSUITE} |