From 49f9101e8b235e35d6241e0f7917fa4b422e8f58 Mon Sep 17 00:00:00 2001 From: rand00 Date: Wed, 21 Dec 2022 12:00:20 +0100 Subject: [PATCH] packaging/perftest.sh: Moved exit-logic for when test-results exist --- packaging/perftest.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packaging/perftest.sh b/packaging/perftest.sh index faabd1c..14e53f0 100755 --- a/packaging/perftest.sh +++ b/packaging/perftest.sh @@ -112,16 +112,18 @@ PERFSCRIPT_DIR="$PERFJOB_DIR" #< goto think if this dir makes the most sense PERFDATA_DIR="$PERFJOB_DIR/$BIN_SHA256" +if [ -d "$PERFDATA_DIR" ]; then + info "$PERFDATA_DIR already exists, exiting" + exit 0 +fi; +#< goto maybe add a 'force' param to rerun test + regenerate plot + SERVER="not-defined" #< goto set test-server ip somewhere - environment variable, or manually set here? case "${JOB},${BIN_EXT}" in unipi,hvt) - if [ -d "$PERFDATA_DIR" ]; then - info "$PERFDATA_DIR already exists, exiting" - exit 0 - fi; - "$PERFSCRIPT_DIR"/run-test.sh "$PERFDATA_DIR" "$PERFJOB_DIR" "$SERVER" "$BIN" + "$PERFSCRIPT_DIR"/run-test.sh "$PERFJOB_DIR" "$PERFDATA_DIR" "$BIN" "$SERVER" "$PERFSCRIPT_DIR"/plot.sh "$PERFJOB_DIR" "$CACHE_DIR" "$DB" "$JOB" "$UUID" ;; *)