project-base/server-skynet-source-3rd-jemalloc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Streamline test output.

Browse Source
This commit is contained in:
Jason Evans 2013-12-12 14:58:26 -08:00
parent 0f4f1efd94
commit 00a9cc7b6d
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/src/test.c
View File

@ -72,11 +72,13 @@ p_test(test_t* t, ...)
} }
va_end(ap); va_end(ap);
malloc_printf("tests: %u, pass: %u, skip: %u, fail: %u\n", malloc_printf("--- %s: %u/%u, %s: %u/%u, %s: %u/%u ---\n",
test_count, test_status_string(test_status_pass),
test_counts[test_status_pass], test_counts[test_status_pass], test_count,
test_counts[test_status_skip], test_status_string(test_status_skip),
test_counts[test_status_fail]); test_counts[test_status_skip], test_count,
test_status_string(test_status_fail),
test_counts[test_status_fail], test_count);
return (ret); return (ret);
} }

17
test/test.sh.in
View File

@ -16,16 +16,16 @@ pass_code=0
skip_code=1 skip_code=1
fail_code=2 fail_code=2
echo "================================================================================"
pass_count=0 pass_count=0
skip_count=0 skip_count=0
fail_count=0 fail_count=0
for t in $@; do for t in $@; do
echo "${t}:" if [ $pass_count -ne 0 -o $skip_count -ne 0 -o $fail_count != 0 ] ; then
${t}@exe@ @abs_srcroot@ @abs_objroot@ > @objroot@${t}.out 2>&1 echo
fi
echo "=== ${t} ==="
${t}@exe@ @abs_srcroot@ @abs_objroot@
result_code=$? result_code=$?
/bin/echo -n " "
tail -n 1 @objroot@${t}.out
case ${result_code} in case ${result_code} in
${pass_code}) ${pass_code})
pass_count=$((pass_count+1)) pass_count=$((pass_count+1))
@ -35,15 +35,16 @@ for t in $@; do
;; ;;
${fail_code}) ${fail_code})
fail_count=$((fail_count+1)) fail_count=$((fail_count+1))
echo " *** ${t} failure; see @objroot@${t}.out for full output ***" 1>&2
;; ;;
*) *)
echo "Test harness error" 1>&2 echo "Test harness error" 1>&2
exit 1 exit 1
esac esac
done done
echo "================================================================================"
echo "Test suite summary: pass: ${pass_count}, skip: ${skip_count}, fail: ${fail_count}" total_count=`expr ${pass_count} + ${skip_count} + ${fail_count}`
echo
echo "Test suite summary: pass: ${pass_count}/${total_count}, skip: ${skip_count}/${total_count}, fail: ${fail_count}/${total_count}"
if [ ${fail_count} -eq 0 ] ; then if [ ${fail_count} -eq 0 ] ; then
exit 0 exit 0