Save the coverage report to a file
Save the "Test Report Summary" to a file. This can help both CI scripts and human readers who want the summary after the fact without having to copy the console output. Take care to exit with a nonzero status if there is a failure while generating the test report summary. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine
parent
bbced87390
commit
fc70b5252b
2 changed files with 105 additions and 88 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -18,6 +18,7 @@ Testing
|
||||||
Coverage
|
Coverage
|
||||||
*.gcno
|
*.gcno
|
||||||
*.gcda
|
*.gcda
|
||||||
|
coverage-summary.txt
|
||||||
|
|
||||||
# generated by scripts/memory.sh
|
# generated by scripts/memory.sh
|
||||||
massif-*
|
massif-*
|
||||||
|
|
|
||||||
|
|
@ -156,116 +156,125 @@ echo "========================================================================="
|
||||||
echo "Test Report Summary"
|
echo "Test Report Summary"
|
||||||
echo
|
echo
|
||||||
|
|
||||||
cd tests
|
{
|
||||||
|
|
||||||
# Step 4a - Unit tests
|
cd tests
|
||||||
echo "Unit tests - tests/scripts/run-test-suites.pl"
|
|
||||||
|
|
||||||
PASSED_TESTS=$(tail -n6 unit-test-$TEST_OUTPUT|sed -n -e 's/test cases passed :[\t]*\([0-9]*\)/\1/p'| tr -d ' ')
|
# Step 4a - Unit tests
|
||||||
SKIPPED_TESTS=$(tail -n6 unit-test-$TEST_OUTPUT|sed -n -e 's/skipped :[ \t]*\([0-9]*\)/\1/p'| tr -d ' ')
|
echo "Unit tests - tests/scripts/run-test-suites.pl"
|
||||||
TOTAL_SUITES=$(tail -n6 unit-test-$TEST_OUTPUT|sed -n -e 's/.* (\([0-9]*\) .*, [0-9]* tests run)/\1/p'| tr -d ' ')
|
|
||||||
FAILED_TESTS=$(tail -n6 unit-test-$TEST_OUTPUT|sed -n -e 's/failed :[\t]*\([0-9]*\)/\1/p' |tr -d ' ')
|
|
||||||
|
|
||||||
echo "No test suites : $TOTAL_SUITES"
|
PASSED_TESTS=$(tail -n6 unit-test-$TEST_OUTPUT|sed -n -e 's/test cases passed :[\t]*\([0-9]*\)/\1/p'| tr -d ' ')
|
||||||
echo "Passed : $PASSED_TESTS"
|
SKIPPED_TESTS=$(tail -n6 unit-test-$TEST_OUTPUT|sed -n -e 's/skipped :[ \t]*\([0-9]*\)/\1/p'| tr -d ' ')
|
||||||
echo "Failed : $FAILED_TESTS"
|
TOTAL_SUITES=$(tail -n6 unit-test-$TEST_OUTPUT|sed -n -e 's/.* (\([0-9]*\) .*, [0-9]* tests run)/\1/p'| tr -d ' ')
|
||||||
echo "Skipped : $SKIPPED_TESTS"
|
FAILED_TESTS=$(tail -n6 unit-test-$TEST_OUTPUT|sed -n -e 's/failed :[\t]*\([0-9]*\)/\1/p' |tr -d ' ')
|
||||||
echo "Total exec'd tests : $(($PASSED_TESTS + $FAILED_TESTS))"
|
|
||||||
echo "Total avail tests : $(($PASSED_TESTS + $FAILED_TESTS + $SKIPPED_TESTS))"
|
|
||||||
echo
|
|
||||||
|
|
||||||
TOTAL_PASS=$PASSED_TESTS
|
echo "No test suites : $TOTAL_SUITES"
|
||||||
TOTAL_FAIL=$FAILED_TESTS
|
echo "Passed : $PASSED_TESTS"
|
||||||
TOTAL_SKIP=$SKIPPED_TESTS
|
echo "Failed : $FAILED_TESTS"
|
||||||
TOTAL_AVAIL=$(($PASSED_TESTS + $FAILED_TESTS + $SKIPPED_TESTS))
|
echo "Skipped : $SKIPPED_TESTS"
|
||||||
TOTAL_EXED=$(($PASSED_TESTS + $FAILED_TESTS))
|
echo "Total exec'd tests : $(($PASSED_TESTS + $FAILED_TESTS))"
|
||||||
|
echo "Total avail tests : $(($PASSED_TESTS + $FAILED_TESTS + $SKIPPED_TESTS))"
|
||||||
|
echo
|
||||||
|
|
||||||
# Step 4b - TLS Options tests
|
TOTAL_PASS=$PASSED_TESTS
|
||||||
echo "TLS Options tests - tests/ssl-opt.sh"
|
TOTAL_FAIL=$FAILED_TESTS
|
||||||
|
TOTAL_SKIP=$SKIPPED_TESTS
|
||||||
|
TOTAL_AVAIL=$(($PASSED_TESTS + $FAILED_TESTS + $SKIPPED_TESTS))
|
||||||
|
TOTAL_EXED=$(($PASSED_TESTS + $FAILED_TESTS))
|
||||||
|
|
||||||
PASSED_TESTS=$(tail -n5 sys-test-$TEST_OUTPUT|sed -n -e 's/.* (\([0-9]*\) \/ [0-9]* tests ([0-9]* skipped))$/\1/p')
|
# Step 4b - TLS Options tests
|
||||||
SKIPPED_TESTS=$(tail -n5 sys-test-$TEST_OUTPUT|sed -n -e 's/.* ([0-9]* \/ [0-9]* tests (\([0-9]*\) skipped))$/\1/p')
|
echo "TLS Options tests - tests/ssl-opt.sh"
|
||||||
TOTAL_TESTS=$(tail -n5 sys-test-$TEST_OUTPUT|sed -n -e 's/.* ([0-9]* \/ \([0-9]*\) tests ([0-9]* skipped))$/\1/p')
|
|
||||||
FAILED_TESTS=$(($TOTAL_TESTS - $PASSED_TESTS))
|
|
||||||
|
|
||||||
echo "Passed : $PASSED_TESTS"
|
PASSED_TESTS=$(tail -n5 sys-test-$TEST_OUTPUT|sed -n -e 's/.* (\([0-9]*\) \/ [0-9]* tests ([0-9]* skipped))$/\1/p')
|
||||||
echo "Failed : $FAILED_TESTS"
|
SKIPPED_TESTS=$(tail -n5 sys-test-$TEST_OUTPUT|sed -n -e 's/.* ([0-9]* \/ [0-9]* tests (\([0-9]*\) skipped))$/\1/p')
|
||||||
echo "Skipped : $SKIPPED_TESTS"
|
TOTAL_TESTS=$(tail -n5 sys-test-$TEST_OUTPUT|sed -n -e 's/.* ([0-9]* \/ \([0-9]*\) tests ([0-9]* skipped))$/\1/p')
|
||||||
echo "Total exec'd tests : $TOTAL_TESTS"
|
FAILED_TESTS=$(($TOTAL_TESTS - $PASSED_TESTS))
|
||||||
echo "Total avail tests : $(($TOTAL_TESTS + $SKIPPED_TESTS))"
|
|
||||||
echo
|
|
||||||
|
|
||||||
TOTAL_PASS=$(($TOTAL_PASS+$PASSED_TESTS))
|
echo "Passed : $PASSED_TESTS"
|
||||||
TOTAL_FAIL=$(($TOTAL_FAIL+$FAILED_TESTS))
|
echo "Failed : $FAILED_TESTS"
|
||||||
TOTAL_SKIP=$(($TOTAL_SKIP+$SKIPPED_TESTS))
|
echo "Skipped : $SKIPPED_TESTS"
|
||||||
TOTAL_AVAIL=$(($TOTAL_AVAIL + $TOTAL_TESTS + $SKIPPED_TESTS))
|
echo "Total exec'd tests : $TOTAL_TESTS"
|
||||||
TOTAL_EXED=$(($TOTAL_EXED + $TOTAL_TESTS))
|
echo "Total avail tests : $(($TOTAL_TESTS + $SKIPPED_TESTS))"
|
||||||
|
echo
|
||||||
|
|
||||||
|
TOTAL_PASS=$(($TOTAL_PASS+$PASSED_TESTS))
|
||||||
|
TOTAL_FAIL=$(($TOTAL_FAIL+$FAILED_TESTS))
|
||||||
|
TOTAL_SKIP=$(($TOTAL_SKIP+$SKIPPED_TESTS))
|
||||||
|
TOTAL_AVAIL=$(($TOTAL_AVAIL + $TOTAL_TESTS + $SKIPPED_TESTS))
|
||||||
|
TOTAL_EXED=$(($TOTAL_EXED + $TOTAL_TESTS))
|
||||||
|
|
||||||
|
|
||||||
# Step 4c - System Compatibility tests
|
# Step 4c - System Compatibility tests
|
||||||
echo "System/Compatibility tests - tests/compat.sh"
|
echo "System/Compatibility tests - tests/compat.sh"
|
||||||
|
|
||||||
PASSED_TESTS=$(cat compat-test-$TEST_OUTPUT | sed -n -e 's/.* (\([0-9]*\) \/ [0-9]* tests ([0-9]* skipped))$/\1/p' | awk 'BEGIN{ s = 0 } { s += $1 } END{ print s }')
|
PASSED_TESTS=$(cat compat-test-$TEST_OUTPUT | sed -n -e 's/.* (\([0-9]*\) \/ [0-9]* tests ([0-9]* skipped))$/\1/p' | awk 'BEGIN{ s = 0 } { s += $1 } END{ print s }')
|
||||||
SKIPPED_TESTS=$(cat compat-test-$TEST_OUTPUT | sed -n -e 's/.* ([0-9]* \/ [0-9]* tests (\([0-9]*\) skipped))$/\1/p' | awk 'BEGIN{ s = 0 } { s += $1 } END{ print s }')
|
SKIPPED_TESTS=$(cat compat-test-$TEST_OUTPUT | sed -n -e 's/.* ([0-9]* \/ [0-9]* tests (\([0-9]*\) skipped))$/\1/p' | awk 'BEGIN{ s = 0 } { s += $1 } END{ print s }')
|
||||||
EXED_TESTS=$(cat compat-test-$TEST_OUTPUT | sed -n -e 's/.* ([0-9]* \/ \([0-9]*\) tests ([0-9]* skipped))$/\1/p' | awk 'BEGIN{ s = 0 } { s += $1 } END{ print s }')
|
EXED_TESTS=$(cat compat-test-$TEST_OUTPUT | sed -n -e 's/.* ([0-9]* \/ \([0-9]*\) tests ([0-9]* skipped))$/\1/p' | awk 'BEGIN{ s = 0 } { s += $1 } END{ print s }')
|
||||||
FAILED_TESTS=$(($EXED_TESTS - $PASSED_TESTS))
|
FAILED_TESTS=$(($EXED_TESTS - $PASSED_TESTS))
|
||||||
|
|
||||||
echo "Passed : $PASSED_TESTS"
|
echo "Passed : $PASSED_TESTS"
|
||||||
echo "Failed : $FAILED_TESTS"
|
echo "Failed : $FAILED_TESTS"
|
||||||
echo "Skipped : $SKIPPED_TESTS"
|
echo "Skipped : $SKIPPED_TESTS"
|
||||||
echo "Total exec'd tests : $EXED_TESTS"
|
echo "Total exec'd tests : $EXED_TESTS"
|
||||||
echo "Total avail tests : $(($EXED_TESTS + $SKIPPED_TESTS))"
|
echo "Total avail tests : $(($EXED_TESTS + $SKIPPED_TESTS))"
|
||||||
echo
|
echo
|
||||||
|
|
||||||
TOTAL_PASS=$(($TOTAL_PASS+$PASSED_TESTS))
|
TOTAL_PASS=$(($TOTAL_PASS+$PASSED_TESTS))
|
||||||
TOTAL_FAIL=$(($TOTAL_FAIL+$FAILED_TESTS))
|
TOTAL_FAIL=$(($TOTAL_FAIL+$FAILED_TESTS))
|
||||||
TOTAL_SKIP=$(($TOTAL_SKIP+$SKIPPED_TESTS))
|
TOTAL_SKIP=$(($TOTAL_SKIP+$SKIPPED_TESTS))
|
||||||
TOTAL_AVAIL=$(($TOTAL_AVAIL + $EXED_TESTS + $SKIPPED_TESTS))
|
TOTAL_AVAIL=$(($TOTAL_AVAIL + $EXED_TESTS + $SKIPPED_TESTS))
|
||||||
TOTAL_EXED=$(($TOTAL_EXED + $EXED_TESTS))
|
TOTAL_EXED=$(($TOTAL_EXED + $EXED_TESTS))
|
||||||
|
|
||||||
|
|
||||||
# Step 4d - Grand totals
|
# Step 4d - Grand totals
|
||||||
echo "-------------------------------------------------------------------------"
|
echo "-------------------------------------------------------------------------"
|
||||||
echo "Total tests"
|
echo "Total tests"
|
||||||
|
|
||||||
echo "Total Passed : $TOTAL_PASS"
|
echo "Total Passed : $TOTAL_PASS"
|
||||||
echo "Total Failed : $TOTAL_FAIL"
|
echo "Total Failed : $TOTAL_FAIL"
|
||||||
echo "Total Skipped : $TOTAL_SKIP"
|
echo "Total Skipped : $TOTAL_SKIP"
|
||||||
echo "Total exec'd tests : $TOTAL_EXED"
|
echo "Total exec'd tests : $TOTAL_EXED"
|
||||||
echo "Total avail tests : $TOTAL_AVAIL"
|
echo "Total avail tests : $TOTAL_AVAIL"
|
||||||
echo
|
echo
|
||||||
|
|
||||||
|
|
||||||
# Step 4e - Coverage
|
# Step 4e - Coverage
|
||||||
echo "Coverage"
|
echo "Coverage"
|
||||||
|
|
||||||
LINES_TESTED=$(tail -n4 cov-$TEST_OUTPUT|sed -n -e 's/ lines......: [0-9]*.[0-9]% (\([0-9]*\) of [0-9]* lines)/\1/p')
|
LINES_TESTED=$(tail -n4 cov-$TEST_OUTPUT|sed -n -e 's/ lines......: [0-9]*.[0-9]% (\([0-9]*\) of [0-9]* lines)/\1/p')
|
||||||
LINES_TOTAL=$(tail -n4 cov-$TEST_OUTPUT|sed -n -e 's/ lines......: [0-9]*.[0-9]% ([0-9]* of \([0-9]*\) lines)/\1/p')
|
LINES_TOTAL=$(tail -n4 cov-$TEST_OUTPUT|sed -n -e 's/ lines......: [0-9]*.[0-9]% ([0-9]* of \([0-9]*\) lines)/\1/p')
|
||||||
FUNCS_TESTED=$(tail -n4 cov-$TEST_OUTPUT|sed -n -e 's/ functions..: [0-9]*.[0-9]% (\([0-9]*\) of [0-9]* functions)$/\1/p')
|
FUNCS_TESTED=$(tail -n4 cov-$TEST_OUTPUT|sed -n -e 's/ functions..: [0-9]*.[0-9]% (\([0-9]*\) of [0-9]* functions)$/\1/p')
|
||||||
FUNCS_TOTAL=$(tail -n4 cov-$TEST_OUTPUT|sed -n -e 's/ functions..: [0-9]*.[0-9]% ([0-9]* of \([0-9]*\) functions)$/\1/p')
|
FUNCS_TOTAL=$(tail -n4 cov-$TEST_OUTPUT|sed -n -e 's/ functions..: [0-9]*.[0-9]% ([0-9]* of \([0-9]*\) functions)$/\1/p')
|
||||||
BRANCHES_TESTED=$(tail -n4 cov-$TEST_OUTPUT|sed -n -e 's/ branches...: [0-9]*.[0-9]% (\([0-9]*\) of [0-9]* branches)$/\1/p')
|
BRANCHES_TESTED=$(tail -n4 cov-$TEST_OUTPUT|sed -n -e 's/ branches...: [0-9]*.[0-9]% (\([0-9]*\) of [0-9]* branches)$/\1/p')
|
||||||
BRANCHES_TOTAL=$(tail -n4 cov-$TEST_OUTPUT|sed -n -e 's/ branches...: [0-9]*.[0-9]% ([0-9]* of \([0-9]*\) branches)$/\1/p')
|
BRANCHES_TOTAL=$(tail -n4 cov-$TEST_OUTPUT|sed -n -e 's/ branches...: [0-9]*.[0-9]% ([0-9]* of \([0-9]*\) branches)$/\1/p')
|
||||||
|
|
||||||
LINES_PERCENT=$((1000*$LINES_TESTED/$LINES_TOTAL))
|
LINES_PERCENT=$((1000*$LINES_TESTED/$LINES_TOTAL))
|
||||||
LINES_PERCENT="$(($LINES_PERCENT/10)).$(($LINES_PERCENT-($LINES_PERCENT/10)*10))"
|
LINES_PERCENT="$(($LINES_PERCENT/10)).$(($LINES_PERCENT-($LINES_PERCENT/10)*10))"
|
||||||
|
|
||||||
FUNCS_PERCENT=$((1000*$FUNCS_TESTED/$FUNCS_TOTAL))
|
FUNCS_PERCENT=$((1000*$FUNCS_TESTED/$FUNCS_TOTAL))
|
||||||
FUNCS_PERCENT="$(($FUNCS_PERCENT/10)).$(($FUNCS_PERCENT-($FUNCS_PERCENT/10)*10))"
|
FUNCS_PERCENT="$(($FUNCS_PERCENT/10)).$(($FUNCS_PERCENT-($FUNCS_PERCENT/10)*10))"
|
||||||
|
|
||||||
BRANCHES_PERCENT=$((1000*$BRANCHES_TESTED/$BRANCHES_TOTAL))
|
BRANCHES_PERCENT=$((1000*$BRANCHES_TESTED/$BRANCHES_TOTAL))
|
||||||
BRANCHES_PERCENT="$(($BRANCHES_PERCENT/10)).$(($BRANCHES_PERCENT-($BRANCHES_PERCENT/10)*10))"
|
BRANCHES_PERCENT="$(($BRANCHES_PERCENT/10)).$(($BRANCHES_PERCENT-($BRANCHES_PERCENT/10)*10))"
|
||||||
|
|
||||||
echo "Lines Tested : $LINES_TESTED of $LINES_TOTAL $LINES_PERCENT%"
|
rm unit-test-$TEST_OUTPUT
|
||||||
echo "Functions Tested : $FUNCS_TESTED of $FUNCS_TOTAL $FUNCS_PERCENT%"
|
rm sys-test-$TEST_OUTPUT
|
||||||
echo "Branches Tested : $BRANCHES_TESTED of $BRANCHES_TOTAL $BRANCHES_PERCENT%"
|
rm compat-test-$TEST_OUTPUT
|
||||||
echo
|
rm cov-$TEST_OUTPUT
|
||||||
|
|
||||||
rm unit-test-$TEST_OUTPUT
|
echo "Lines Tested : $LINES_TESTED of $LINES_TOTAL $LINES_PERCENT%"
|
||||||
rm sys-test-$TEST_OUTPUT
|
echo "Functions Tested : $FUNCS_TESTED of $FUNCS_TOTAL $FUNCS_PERCENT%"
|
||||||
rm compat-test-$TEST_OUTPUT
|
echo "Branches Tested : $BRANCHES_TESTED of $BRANCHES_TOTAL $BRANCHES_PERCENT%"
|
||||||
rm cov-$TEST_OUTPUT
|
echo
|
||||||
|
|
||||||
cd ..
|
# If there was a failure, remind the reader here. This also ensures that
|
||||||
|
# the coverage summary ends with a distinctive mark so that this script
|
||||||
|
# knows to exit with a failure status.
|
||||||
|
if [ $TOTAL_FAIL -ne 0 ]; then
|
||||||
|
echo "Note: $TOTAL_FAIL failures."
|
||||||
|
fi
|
||||||
|
|
||||||
|
} | tee coverage-summary.txt
|
||||||
|
|
||||||
make clean
|
make clean
|
||||||
|
|
||||||
|
|
@ -273,6 +282,13 @@ if [ -f "$CONFIG_BAK" ]; then
|
||||||
mv "$CONFIG_BAK" "$CONFIG_H"
|
mv "$CONFIG_BAK" "$CONFIG_H"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $TOTAL_FAIL -ne 0 ]; then
|
# If the coverage summary doesn't end with the expected last two lines
|
||||||
exit 1
|
# ("Branches Tested" and a blank line), either there was an error while
|
||||||
fi
|
# creating the coverage summary or the coverage summary reported failures.
|
||||||
|
newline='
|
||||||
|
'
|
||||||
|
case "$(tail -n2 coverage-summary.txt)" in
|
||||||
|
*"$newline"*) exit 1;;
|
||||||
|
"Branches Tested"*) :;;
|
||||||
|
*) exit 1;;
|
||||||
|
esac
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue