Playground/1brc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not silence test.sh output

Browse Source
This commit is contained in:
Jason Nochlin 2024-01-13 09:27:57 -07:00 committed by Gunnar Morling
parent d5f8442a26
commit f29f8fb216
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
evaluate.sh
View File

@ -136,33 +136,30 @@ fi
# Run tests and benchmark for each fork # Run tests and benchmark for each fork
filetimestamp=$(date +"%Y%m%d%H%M%S") # same for all fork.out files from this run filetimestamp=$(date +"%Y%m%d%H%M%S") # same for all fork.out files from this run
failed=() failed=()
test_output=$(mktemp)
for fork in "$@"; do 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 set +e # we don't want prepare.sh, test.sh or hyperfine failing on 1 fork to exit the script early
# Run the test suite # Run the test suite
print_and_execute $TIMEOUT ./test.sh $fork | tee $test_output > /dev/null 2>&1 print_and_execute $TIMEOUT ./test.sh $fork
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
failed+=("$fork") failed+=("$fork")
echo "" echo ""
echo -e "${BOLD_RED}FAILURE${RESET}: ./test.sh $fork failed" echo -e "${BOLD_RED}FAILURE${RESET}: ./test.sh $fork failed"
cat $test_output
echo ""
continue continue
fi fi
echo ""
# Run the test on $MEASUREMENTS_FILE; this serves as the warmup # Run the test on $MEASUREMENTS_FILE; this serves as the warmup
print_and_execute $TIMEOUT ./test.sh $fork $MEASUREMENTS_FILE | tee $test_output > /dev/null 2>&1 print_and_execute $TIMEOUT ./test.sh $fork $MEASUREMENTS_FILE
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
failed+=("$fork") failed+=("$fork")
echo "" echo ""
echo -e "${BOLD_RED}FAILURE${RESET}: ./test.sh $fork $MEASUREMENTS_FILE failed" echo -e "${BOLD_RED}FAILURE${RESET}: ./test.sh $fork $MEASUREMENTS_FILE failed"
cat $test_output
echo ""
continue continue
fi fi
echo ""
# re-link measurements.txt since test.sh deleted it # re-link measurements.txt since test.sh deleted it
print_and_execute rm -f measurements.txt print_and_execute rm -f measurements.txt
@ -197,7 +194,6 @@ for fork in "$@"; do
fi fi
done done
set -e set -e
rm $test_output
# Summary # Summary
echo -e "${BOLD_WHITE}Summary${RESET}" echo -e "${BOLD_WHITE}Summary${RESET}"