From eb3f6313a569c58ccf64c8d792c1a50e55e35924 Mon Sep 17 00:00:00 2001 From: Robert Izzard <r.izzard@surrey.ac.uk> Date: Thu, 28 Nov 2019 01:11:29 +0800 Subject: [PATCH] fix tbse run : was a problem with quoting --- tbse | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tbse b/tbse index 4e40be8f9..9c3163bc0 100755 --- a/tbse +++ b/tbse @@ -2322,7 +2322,7 @@ then while read -r ARGS; do echo "READ $ARGS from $FILE" # run binary_c - "$ARGS_PREFIX $ARGS $ARGS_POSTFIX" "$@" + $ARGS_PREFIX $ARGS $ARGS_POSTFIX $@ ERROR=$? # save return code and exit if non-zero if ((ERROR != 0)); then @@ -2359,7 +2359,7 @@ then ARGS="$(echo "$ARGS" | sed -e s/At\ 20[0-9][0-9]-[0-9][0-9]-[0-9][0-9]\ [0-9][0-9]\:[0-9][0-9]\:[0-9][0-9]\ \:\ //)" # run binary_c - "$ARGS_PREFIX $DEFAULT_ARGS $ARGS $ARGS_POSTFIX" "$@" "$FIRST_TBSE" + $ARGS_PREFIX $DEFAULT_ARGS $ARGS $ARGS_POSTFIX $@ $FIRST_TBSE ERROR=$? # save return code and exit if non-zero if (("$ERROR" != 0)); then @@ -2441,10 +2441,10 @@ then svn stat > "$SVNSTATFILE" 2>&1 svn --version > "$SVNVERSIONFILE" 2>&1 cp src/Makefile "$MAKEFILE" - "$ARGS_PREFIX" "$ARGS" --version > "$VERSIONFILE" 2>&1 + $ARGS_PREFIX $ARGS --version > "$VERSIONFILE" 2>&1 # run tbse - "$ARGS_PREFIX" "$ARGS" > "$OUTFILE" 2> "$ERRFILE" + $ARGS_PREFIX $ARGS > "$OUTFILE" 2> "$ERRFILE" # make tarball tar -C "$TMPDIR" -j -c -f "$TARBZFILE" "$FILES" @@ -2469,7 +2469,7 @@ then for i in $(seq 0 "$NCORES"); do LOGFILE="/tmp/c_log$i.dat" echo "Run on core $i, log in $LOGFILE" - "$VALGRIND_" "$ARGS_PREFIX" "$ARGS" "$ARGS_POSTFIX" --log_filename "$LOGFILE" & + $VALGRIND_ $ARGS_PREFIX $ARGS $ARGS_POSTFIX --log_filename "$LOGFILE" & PIDLIST="$PIDLIST $!" done @@ -2497,7 +2497,7 @@ else ############################################################ ### normal single-system run ############################################################ - "$ARGS_PREFIX" "$ARGS" "$ARGS_POSTFIX" + $ARGS_PREFIX $ARGS $ARGS_POSTFIX STATUS=$? if [ "$VERBOSE" -eq "1" ]; then -- GitLab