Bugfix for CWL conformance test script, refs #8558

diff --git a/sdk/cwl/test_with_arvbox.sh b/sdk/cwl/test_with_arvbox.sh
index 83ba66b2e8d6aebd565fcf28cb874e0f5ea6ac2e..0fda2b846130a19c715c76b1e916dc3c1a2cd109 100755 (executable)
--- a/sdk/cwl/test_with_arvbox.sh
+++ b/sdk/cwl/test_with_arvbox.sh
@@ -8,15 +8,17 @@ reset_container=1
 leave_running=0
 
 while test -n "$1" ; do
-    arg="$1"; shift
+    arg="$1"
     case "$arg" in
         --no-reset-container)
             reset_container=0
+            shift;
             ;;
         --leave-running)
             leave_running=1
+            shift;
             ;;
-        *)
+        -*)
             break
             ;;
     esac
@@ -34,7 +36,9 @@ fi
 arvbox start dev
 
 arvbox pipe <<EOF
-set -e
+set -eu -o pipefail
+
+. /usr/local/lib/arvbox/common.sh
 
 cd /usr/src/arvados/sdk/cwl
 python setup.py sdist