From: msweet Date: Mon, 8 Jun 2015 15:05:11 +0000 (+0000) Subject: Update "make check" to report on the exit status of cupsd (useful for seeing if cupsd X-Git-Tag: v2.2b1~268 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87f8ade3e3ced7b74cefe1569cd393539e5ac04e;p=thirdparty%2Fcups.git Update "make check" to report on the exit status of cupsd (useful for seeing if cupsd crashed; maybe we can grab a crash log?) Add hyperlinks to each of the major sections. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12696 a1ca3aef-8c08-0410-bb20-df032aa958be --- diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh index 4901c778bc..84808917a9 100755 --- a/test/run-stp-tests.sh +++ b/test/run-stp-tests.sh @@ -737,7 +737,7 @@ cat str-header.html >$strfile echo "" echo "Running IPP compliance tests..." -echo "

1 - IPP Compliance Tests

" >>$strfile +echo "

1 - IPP Compliance Tests

" >>$strfile echo "

This section provides the results to the IPP compliance tests" >>$strfile echo "outlined in the CUPS Software Test Plan. These tests were run on" >>$strfile echo `date "+%Y-%m-%d"` by $user on `hostname`. >>$strfile @@ -775,7 +775,7 @@ echo "" >>$strfile echo "" echo "Running command tests..." -echo "

2 - Command Tests

" >>$strfile +echo "

2 - Command Tests

" >>$strfile echo "

This section provides the results to the command tests" >>$strfile echo "outlined in the CUPS Software Test Plan. These tests were run on" >>$strfile echo $date by $user on `hostname`. >>$strfile @@ -840,12 +840,8 @@ echo "" >>$strfile # kill $cupsd - -# -# Append the log files for post-mortim... -# - -echo "

3 - Log Files

" >>$strfile +wait $cupsd +cupsdstatus=$? # # Verify counts... @@ -853,7 +849,16 @@ echo "

3 - Log Files

" >>$strfile echo "Test Summary" echo "" -echo "

Summary

" >>$strfile +echo "

3 - Test Summary

" >>$strfile + +if test $cupsdstatus != 0; then + echo "FAIL: cupsd failed with exit status $cupsdstatus." + echo "

FAIL: cupsd failed with exit status $cupsdstatus.

" >>$strfile + fail=`expr $fail + 1` +else + echo "PASS: cupsd exited with no errors." + echo "

PASS: cupsd exited with no errors.

" >>$strfile +fi # Job control files count=`ls -1 $BASE/spool | wc -l` @@ -1052,18 +1057,23 @@ else echo "

PASS: $count debug2 messages.

" >>$strfile fi +# # Log files... -echo "

access_log

" >>$strfile +# + +echo "

4 - Log Files

" >>$strfile + +echo "

access_log

" >>$strfile echo "
" >>$strfile
 sed -e '1,$s/&/&/g' -e '1,$s/>$strfile
 echo "
" >>$strfile -echo "

error_log

" >>$strfile +echo "

error_log

" >>$strfile echo "
" >>$strfile
 $GREP -v '^d' $BASE/log/error_log | sed -e '1,$s/&/&/g' -e '1,$s/>$strfile
 echo "
" >>$strfile -echo "

page_log

" >>$strfile +echo "

page_log

" >>$strfile echo "
" >>$strfile
 sed -e '1,$s/&/&/g' -e '1,$s/>$strfile
 echo "
" >>$strfile diff --git a/test/str-header.html b/test/str-header.html index dae9e0df42..d13205af63 100644 --- a/test/str-header.html +++ b/test/str-header.html @@ -1,7 +1,7 @@ - + CUPS 2.1 Software Test Report @@ -24,7 +24,12 @@ are used to evaluate the stability and compliance of CUPS Version 2.1.

This software test plan is organized into the following sections: