]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
projects / thirdparty / cups.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 370e42d)
Update "make check" to report on the exit status of cupsd (useful for seeing if cupsd
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Mon, 8 Jun 2015 15:05:11 +0000 (15:05 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Mon, 8 Jun 2015 15:05:11 +0000 (15:05 +0000)
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

test/run-stp-tests.sh patch | blob | blame | history
test/str-header.html patch | blob | blame | history

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 4901c778bcc16715ea2d04ffee416effaff75075..84808917a9ed09e94034a640e59604bc12f83df6 100755 (executable)
--- 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 "<H1>1 - IPP Compliance Tests</H1>" >>$strfile
+echo "<H1><A NAME='IPP'>1 - IPP Compliance Tests</A></H1>" >>$strfile
 echo "<P>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 "</PRE>" >>$strfile
 echo ""
 echo "Running command tests..."
 
-echo "<H1>2 - Command Tests</H1>" >>$strfile
+echo "<H1><A NAME='COMMAND'>2 - Command Tests</A></H1>" >>$strfile
 echo "<P>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 "</PRE>" >>$strfile
 #
 
 kill $cupsd
-
-#
-# Append the log files for post-mortim...
-#
-
-echo "<H1>3 - Log Files</H1>" >>$strfile
+wait $cupsd
+cupsdstatus=$?
 
 #
 # Verify counts...
@@ -853,7 +849,16 @@ echo "<H1>3 - Log Files</H1>" >>$strfile
 
 echo "Test Summary"
 echo ""
-echo "<H2>Summary</H2>" >>$strfile
+echo "<H1><A NAME='SUMMARY'>3 - Test Summary</A></H1>" >>$strfile
+
+if test $cupsdstatus != 0; then
+       echo "FAIL: cupsd failed with exit status $cupsdstatus."
+       echo "<p>FAIL: cupsd failed with exit status $cupsdstatus.</p>" >>$strfile
+       fail=`expr $fail + 1`
+else
+       echo "PASS: cupsd exited with no errors."
+       echo "<p>PASS: cupsd exited with no errors.</p>" >>$strfile
+fi
 
 # Job control files
 count=`ls -1 $BASE/spool | wc -l`
@@ -1052,18 +1057,23 @@ else
        echo "<P>PASS: $count debug2 messages.</P>" >>$strfile
 fi
 
+#
 # Log files...
-echo "<H2>access_log</H2>" >>$strfile
+#
+
+echo "<H1><A NAME='LOGS'>4 - Log Files</A></H1>" >>$strfile
+
+echo "<H2><A NAME='access_log'>access_log</A></H2>" >>$strfile
 echo "<PRE>" >>$strfile
 sed -e '1,$s/&/&amp;/g' -e '1,$s/</&lt;/g' $BASE/log/access_log >>$strfile
 echo "</PRE>" >>$strfile
 
-echo "<H2>error_log</H2>" >>$strfile
+echo "<H2><A NAME='error_log'>error_log</A></H2>" >>$strfile
 echo "<PRE>" >>$strfile
 $GREP -v '^d' $BASE/log/error_log | sed -e '1,$s/&/&amp;/g' -e '1,$s/</&lt;/g' >>$strfile
 echo "</PRE>" >>$strfile
 
-echo "<H2>page_log</H2>" >>$strfile
+echo "<H2><A NAME='page_log'>page_log</A></H2>" >>$strfile
 echo "<PRE>" >>$strfile
 sed -e '1,$s/&/&amp;/g' -e '1,$s/</&lt;/g' $BASE/log/page_log >>$strfile
 echo "</PRE>" >>$strfile
diff --git a/test/str-header.html b/test/str-header.html
index dae9e0df4260584538e5cd6b75f009dc62f47b7a..d13205af63b575ccd7d7c6c1e38aa53a17b2935f 100644 (file)
--- a/test/str-header.html
+++ b/test/str-header.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
        <META NAME="Description" CONTENT="CUPS Test Report">
-       <META NAME="COPYRIGHT" CONTENT="Copyright 2007-2014, All Rights Reserved">
+       <META NAME="COPYRIGHT" CONTENT="Copyright 2007-2015, All Rights Reserved">
        <META NAME="DOCNUMBER" CONTENT="CUPS-STR-2.1">
        <META NAME="Author" CONTENT="Apple Inc.">
        <TITLE>CUPS 2.1 Software Test Report</TITLE>
@@ -24,7 +24,12 @@ are used to evaluate the stability and compliance of CUPS Version 2.1.
 <P>This software test plan is organized into the following sections:
 
 <UL>
-       <LI>1 - IPP Compliance Tests</LI>
-       <LI>2 - Command Tests</LI>
-       <LI>3 - Log Files</LI>
+       <LI><A HREF="#IPP">1 - IPP Compliance Tests</A></LI>
+       <LI><A HREF="#COMMAND">2 - Command Tests</A></LI>
+       <LI><A HREF="#SUMMARY">3 - Test Summary</A></LI>
+       <LI><A HREF="#LOGS">4 - Log Files</A><UL>
+               <LI><A HREF="#access_log">access_log</A></LI>
+               <LI><A HREF="#error_log">error_log</A></LI>
+               <LI><A HREF="#page_log">page_log</A></LI>
+       </UL></LI>
 </UL>
Mirror of https://github.com/OpenPrinting/cups.git