From a8fd06710158298bf71010344f67b791a965d762 Mon Sep 17 00:00:00 2001 From: Gunnar Morling Date: Sun, 14 Jan 2024 10:13:01 +0100 Subject: [PATCH] Making sure default SDK is used when evaluating multiple entries and there are some without prepare script --- evaluate.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/evaluate.sh b/evaluate.sh index fa6f4aa..f92a456 100755 --- a/evaluate.sh +++ b/evaluate.sh @@ -139,6 +139,13 @@ failed=() for fork in "$@"; do set +e # we don't want prepare.sh, test.sh or hyperfine failing on 1 fork to exit the script early + # Run prepare script + if [ -f "./prepare_$fork.sh" ]; then + print_and_execute source "./prepare_$fork.sh" + else + print_and_execute sdk use java $DEFAULT_JAVA_VERSION + fi + # Run the test suite print_and_execute $TIMEOUT ./test.sh $fork if [ $? -ne 0 ]; then @@ -165,13 +172,6 @@ for fork in "$@"; do print_and_execute rm -f measurements.txt print_and_execute ln -s $MEASUREMENTS_FILE measurements.txt - # Run prepare script - if [ -f "./prepare_$fork.sh" ]; then - print_and_execute source "./prepare_$fork.sh" - else - print_and_execute sdk use java $DEFAULT_JAVA_VERSION - fi - # Use hyperfine to run the benchmark for each fork HYPERFINE_OPTS="--warmup 0 --runs $RUNS --export-json $fork-$filetimestamp-timing.json --output ./$fork-$filetimestamp.out"