From 2c9b698e85fc55f3a0b865d5407044a05986736a Mon Sep 17 00:00:00 2001 From: Guillaume Lambert Date: Thu, 17 Jun 2021 14:15:24 +0200 Subject: [PATCH] Refactor: how to pass options to tox in tox-run.sh Signed-off-by: Guillaume Lambert Change-Id: I3cae2a28f8cdf10b4b547f729d436cb204322247 --- shell/tox-run.sh | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/shell/tox-run.sh b/shell/tox-run.sh index 68a5af94..682650c9 100644 --- a/shell/tox-run.sh +++ b/shell/tox-run.sh @@ -34,23 +34,21 @@ fi tox --version PARALLEL="${PARALLEL:-true}" +TOX_OPTIONS_LIST="" + +if [[ -n ${TOX_ENVS:-} ]]; then + TOX_OPTIONS_LIST=$TOX_OPTIONS_LIST" -e $TOX_ENVS" +fi; + 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=$TOX_OPTIONS_LIST" --parallel auto --parallel-live" +fi; + +# $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" -- 2.16.6