diff options
Diffstat (limited to 'check')
| -rwxr-xr-x | check | 114 |
1 files changed, 58 insertions, 56 deletions
@@ -36,6 +36,7 @@ have_test_arg=false randomize=false export here=`pwd` xfile="" +brief_test_summary=false DUMP_OUTPUT=false @@ -71,6 +72,7 @@ check options -T output timestamps -r randomize test order -d dump test output to stdout + -b brief test summary --large-fs optimise scratch device for large filesystems -s section run only specified section from config file -S section exclude the specified section from the config file @@ -244,6 +246,7 @@ while [ $# -gt 0 ]; do -T) timestamp=true ;; -d) DUMP_OUTPUT=true ;; + -b) brief_test_summary=true;; --large-fs) export LARGE_SCRATCH_DEV=yes ;; --extra-space=*) export SCRATCH_DEV_EMPTY_SPACE=${r#*=} ;; @@ -319,71 +322,70 @@ _wipe_counters() _wrapup() { - seq="check" - check="$RESULT_BASE/check" + seq="check" + check="$RESULT_BASE/check" - if $showme - then + if $showme; then : - elif $needwrap - then - if [ -f $check.time -a -f $tmp.time ] - then - cat $check.time $tmp.time \ - | $AWK_PROG ' - { t[$1] = $2 } -END { if (NR > 0) { - for (i in t) print i " " t[i] - } - }' \ - | sort -n >$tmp.out - mv $tmp.out $check.time - fi + elif $needwrap; then + if [ -f $check.time -a -f $tmp.time ]; then + cat $check.time $tmp.time \ + | $AWK_PROG ' + { t[$1] = $2 } + END { + if (NR > 0) { + for (i in t) print i " " t[i] + } + }' \ + | sort -n >$tmp.out + mv $tmp.out $check.time + fi - echo "" >>$check.log - date >>$check.log + echo "" >>$check.log + date >>$check.log - echo "SECTION -- $section" >>$tmp.summary - echo "=========================" >>$tmp.summary - if [ ! -z "$n_try" -a $n_try != 0 ] - then - echo "Ran:$try" - echo "Ran:$try" >>$check.log - echo "Ran:$try" >>$tmp.summary - fi + echo "SECTION -- $section" >>$tmp.summary + echo "=========================" >>$tmp.summary + if [ ! -z "$n_try" -a $n_try != 0 ]; then + if [ $brief_test_summary == "false" ]; then + echo "Ran:$try" + echo "Ran:$try" >>$tmp.summary + fi + echo "Ran:$try" >>$check.log + fi - $interrupt && echo "Interrupted!" >>$check.log + $interrupt && echo "Interrupted!" >>$check.log - if [ ! -z "$notrun" ] - then - echo "Not run:$notrun" - echo "Not run:$notrun" >>$check.log - echo "Not run:$notrun" >>$tmp.summary + if [ ! -z "$notrun" ]; then + if [ $brief_test_summary == "false" ]; then + echo "Not run:$notrun" + echo "Not run:$notrun" >>$tmp.summary + fi + echo "Not run:$notrun" >>$check.log + fi + + if [ ! -z "$n_bad" -a $n_bad != 0 ]; then + echo "Failures:$bad" + echo "Failed $n_bad of $n_try tests" + echo "Failures:$bad" >>$check.log + echo "Failed $n_bad of $n_try tests" >>$check.log + echo "Failures:$bad" >>$tmp.summary + echo "Failed $n_bad of $n_try tests" >>$tmp.summary + else + echo "Passed all $n_try tests" + echo "Passed all $n_try tests" >>$check.log + echo "Passed all $n_try tests" >>$tmp.summary + fi + echo "" >>$tmp.summary + needwrap=false fi - if [ ! -z "$n_bad" -a $n_bad != 0 ] - then - echo "Failures:$bad" - echo "Failed $n_bad of $n_try tests" - echo "Failures:$bad" >>$check.log - echo "Failed $n_bad of $n_try tests" >>$check.log - echo "Failures:$bad" >>$tmp.summary - echo "Failed $n_bad of $n_try tests" >>$tmp.summary - else - echo "Passed all $n_try tests" - echo "Passed all $n_try tests" >>$check.log - echo "Passed all $n_try tests" >>$tmp.summary + sum_bad=`expr $sum_bad + $n_bad` + _wipe_counters + rm -f /tmp/*.rawout /tmp/*.out /tmp/*.err /tmp/*.time + if ! $OPTIONS_HAVE_SECTIONS; then + rm -f $tmp.* fi - echo "" >>$tmp.summary - needwrap=false - fi - - sum_bad=`expr $sum_bad + $n_bad` - _wipe_counters - rm -f /tmp/*.rawout /tmp/*.out /tmp/*.err /tmp/*.time - if ! $OPTIONS_HAVE_SECTIONS; then - rm -f $tmp.* - fi } _summary() |