2 files changed, 10 insertions, 26 deletions
diff --git a/contrib/cirrus/integration_test.sh b/contrib/cirrus/integration_test.sh
index c80367454..33e9fbc6b 100755
--- a/contrib/cirrus/integration_test.sh
+++ b/contrib/cirrus/integration_test.sh
@@ -6,6 +6,11 @@ source $(dirname $0)/lib.sh
 
 req_env_var GOSRC SCRIPT_BASE OS_RELEASE_ID OS_RELEASE_VER CONTAINER_RUNTIME VARLINK_LOG
 
+LOCAL_OR_REMOTE=local
+if [[ "$TEST_REMOTE_CLIENT" = "true" ]]; then
+    LOCAL_OR_REMOTE=remote
+fi
+
 # Our name must be of the form xxxx_test or xxxx_test.sh, where xxxx is
 # the test suite to run; currently (2019-05) the only option is 'integration'
 # but pr2947 intends to add 'system'.
@@ -34,7 +39,7 @@ case "$SPECIALMODE" in
         req_env_var ROOTLESS_USER
         ssh $ROOTLESS_USER@localhost \
                 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no \
-                -o CheckHostIP=no $GOSRC/$SCRIPT_BASE/rootless_test.sh ${TESTSUITE}
+                -o CheckHostIP=no $GOSRC/$SCRIPT_BASE/rootless_test.sh ${TESTSUITE} ${LOCAL_OR_REMOTE}
         ;;
     endpoint)
         make
@@ -53,12 +58,7 @@ case "$SPECIALMODE" in
         make install PREFIX=/usr ETCDIR=/etc
         make test-binaries
         make .install.bats
-        if [[ "$TEST_REMOTE_CLIENT" == "true" ]]
-        then
-            make remote${TESTSUITE} VARLINK_LOG=$VARLINK_LOG
-        else
-            make local${TESTSUITE}
-        fi
+        make ${LOCAL_OR_REMOTE}${TESTSUITE} PODMAN_SERVER_LOG=$PODMAN_SERVER_LOG
         ;;
     *)
         die 110 "Unsupported \$SPECIALMODE: $SPECIALMODE"
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}