1 files changed, 19 insertions, 2 deletions
diff --git a/contrib/cirrus/rootless_test.sh b/contrib/cirrus/rootless_test.sh
index 3b668034b..3f45aac84 100755
--- a/contrib/cirrus/rootless_test.sh
+++ b/contrib/cirrus/rootless_test.sh
@@ -2,6 +2,14 @@
 
 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" ]]
@@ -10,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
 
@@ -25,5 +39,8 @@ cd "$GOSRC"
 make
 make varlink_generate
 make test-binaries
-make ginkgo
-make ginkgo-remote
+if [ $remote -eq 0 ]; then
+    make local${TESTSUITE}
+else
+    make remote${TESTSUITE}
+fi