From 469e9a2efd9eb0181ba355dee43d094c6cccce5d Mon Sep 17 00:00:00 2001 From: caleb-sitton-inl Date: Wed, 17 Jul 2024 10:40:34 -0600 Subject: [PATCH] Fixed multi-word arguments bug in run_tests (#2340) * Fixed multi-word arg bug --- run_tests | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/run_tests b/run_tests index c1b8b1b98b..ff443a20c6 100755 --- a/run_tests +++ b/run_tests @@ -143,9 +143,9 @@ if [[ $DO_RAVEN == 0 ]]; then echo echo Running $P tests ... # get location of ExamplePlugin test dir - ROOK_COMMAND="$PYTHON_COMMAND $SCRIPT_DIR/rook/main.py --test-dir $LOCATION --testers-dir $RAVEN_DIR/scripts/TestHarness/testers,$LOCATION/../src/Testers --add-non-default-run-types qsub ${ARGS[@]}" + EXTRA="--test-dir $LOCATION --testers-dir $RAVEN_DIR/scripts/TestHarness/testers,$LOCATION/../src/Testers --add-non-default-run-types qsub" + $PYTHON_COMMAND $SCRIPT_DIR/rook/main.py $EXTRA "${ARGS[@]}" # $PYTHON_COMMAND $SCRIPT_DIR/rook/main.py --test-dir $LOCATION --add-non-default-run-types qsub "${ARGS[@]}" - $ROOK_COMMAND rc=$? ALL_PASS=$(($ALL_PASS + $rc)) if [[ $rc != 0 ]]; then @@ -171,11 +171,13 @@ if [[ $DO_PLUGINS == 0 ]]; then echo echo Starting tests for plugin "$P" ... # add RAVEN testers to plugin testers - ROOK_COMMAND="$PYTHON_COMMAND $SCRIPT_DIR/rook/main.py --test-dir $LOCATION --testers-dir $RAVEN_DIR/scripts/TestHarness/testers,$LOCATION/../src/Testers --add-non-default-run-types qsub ${ARGS[@]}" - echo Running ROOK command: "$ROOK_COMMAND" ... + EXTRA="--test-dir $LOCATION --testers-dir $RAVEN_DIR/scripts/TestHarness/testers,$LOCATION/../src/Testers --add-non-default-run-types qsub" + echo Running ROOK command: "$PYTHON_COMMAND $SCRIPT_DIR/rook/main.py $EXTRA ${ARGS[@]} ..." { # try - $ROOK_COMMAND + # this is copy/paste from line 175 + # saving this entire command in a string variable causes problems when there are multi-word args using quotes (--arg="con tent") in ARGS + $PYTHON_COMMAND $SCRIPT_DIR/rook/main.py $EXTRA "${ARGS[@]}" rc=$? } || { # catch