X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=sidebyside;f=shell%2Ftox-run.sh;h=4321ea68ba47760cb2ca104944d7bc8e8e1bf06c;hb=eafdcafcbe25dbad05e5117aca20bf6ea048ac44;hp=68a5af9420f2c13d898b44876bd0ed719fad6cf8;hpb=43e8d01716072314eb7d90cb1da1db4b431bb6cd;p=releng%2Fglobal-jjb.git

diff --git a/shell/tox-run.sh b/shell/tox-run.sh
index 68a5af94..4321ea68 100644
--- a/shell/tox-run.sh
+++ b/shell/tox-run.sh
@@ -34,23 +34,27 @@ fi
 tox --version
 
 PARALLEL="${PARALLEL:-true}"
-if [[ ${PARALLEL,,} = true ]]; then
-    if [[ -n ${TOX_ENVS:-} ]]; then
-        tox -e "$TOX_ENVS" --parallel auto --parallel-live | tee -a "$ARCHIVE_TOX_DIR/tox.log"
-        tox_status="${PIPESTATUS[0]}"
-    else
-        tox --parallel auto --parallel-live | tee -a "$ARCHIVE_TOX_DIR/tox.log"
-        tox_status="${PIPESTATUS[0]}"
-    fi
-else
-    if [[ -n ${TOX_ENVS:-} ]]; then
-        tox -e "$TOX_ENVS" | tee -a "$ARCHIVE_TOX_DIR/tox.log"
-        tox_status="${PIPESTATUS[0]}"
-    else
-        tox | tee -a "$ARCHIVE_TOX_DIR/tox.log"
-        tox_status="${PIPESTATUS[0]}"
-    fi
-fi
+TOX_OPTIONS_LIST=""
+
+if [[ -n ${TOX_ENVS:-} ]]; then
+    TOX_OPTIONS_LIST=$TOX_OPTIONS_LIST" -e $TOX_ENVS"
+fi;
+
+case ${PARALLEL,,} in
+    true|auto )
+        TOX_OPTIONS_LIST=$TOX_OPTIONS_LIST" --parallel auto --parallel-live";;
+    all )
+        TOX_OPTIONS_LIST=$TOX_OPTIONS_LIST" --parallel all --parallel-live";;
+    [0-9]* )
+        TOX_OPTIONS_LIST=$TOX_OPTIONS_LIST" --parallel ${PARALLEL} --parallel-live";;
+esac
+
+
+# $TOX_OPTIONS_LIST are intentionnaly not surrounded by quotes
+# to correcly pass options to tox
+# shellcheck disable=SC2086
+tox $TOX_OPTIONS_LIST | tee -a "$ARCHIVE_TOX_DIR/tox.log"
+tox_status="${PIPESTATUS[0]}"
 
 echo "---> Completed tox runs"