r4937 - in trunk: BOOK BOOK/introduction/welcome BOOK/pst/printing patches

randy at linuxfromscratch.org randy at linuxfromscratch.org
Mon Aug 15 11:49:56 PDT 2005


Author: randy
Date: 2005-08-15 12:49:52 -0600 (Mon, 15 Aug 2005)
New Revision: 4937

Added:
   trunk/patches/cups-1.1.23-testsuite_fix-1.patch
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/pst/printing/cups.xml
Log:
Added a patch and a note about the test suite to the CUPS instructions

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2005-08-15 15:12:26 UTC (rev 4936)
+++ trunk/BOOK/general.ent	2005-08-15 18:49:52 UTC (rev 4937)
@@ -1,4 +1,4 @@
-<!ENTITY day          "14">
+<!ENTITY day          "15">
 <!ENTITY month        "08">
 <!ENTITY year         "2005">
 <!ENTITY version      "svn-&year;&month;&day;">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-08-15 15:12:26 UTC (rev 4936)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-08-15 18:49:52 UTC (rev 4937)
@@ -25,6 +25,11 @@
   <itemizedlist>
 
     <listitem>
+      <para>August 15th, 2005 [randy]: Added a patch and a note about running
+      the test suite to the CUPS instructions.</para>
+    </listitem>
+
+    <listitem>
       <para>August 14th, 2005 [randy]: Updates to PHP: added new dependencies,
       placed the dependencies in catagories, added instructions to install
       documentation, added instruction to update php.ini and minor textual

Modified: trunk/BOOK/pst/printing/cups.xml
===================================================================
--- trunk/BOOK/pst/printing/cups.xml	2005-08-15 15:12:26 UTC (rev 4936)
+++ trunk/BOOK/pst/printing/cups.xml	2005-08-15 18:49:52 UTC (rev 4937)
@@ -9,7 +9,7 @@
   <!ENTITY cups-md5sum        "4ce09b1dce09b6b9398af0daae9adf63">
   <!ENTITY cups-size          "8.7 MB">
   <!ENTITY cups-buildsize     "48 MB">
-  <!ENTITY cups-time          "0.52 SBU (additional 69 SBU to run full test suite)">
+  <!ENTITY cups-time          "0.5 SBU">
 ]>
 
 <sect1 id="cups" xreflabel="CUPS-&cups-version;">
@@ -56,6 +56,14 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem> 
+        <para>Recommended patch: <ulink
+        url="&patch-root;/cups-&cups-version;-testsuite_fix-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">CUPS Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
@@ -100,12 +108,23 @@
 <screen><userinput>sed -i -e "s at pam/pam at security/pam at g" \
 {config-scripts/cups-pam.m4,scheduler/auth.c,configure}</userinput></screen>
 
+    <para>If you plan on running the test suite, you should apply the patch
+    listed above to fix several issues in the test suite script. Note that if
+    you have the non-free <command>htmldoc</command> program installed, the
+    patch disables its use.</para>
+
+    <screen><userinput>patch -Np1 -i ../cups-&cups-version;-testsuite_fix-1.patch</userinput></screen>
+
     <para>Install <application>CUPS</application> by running the
     following commands:</para>
 
 <screen><userinput>./configure &&
 make</userinput></screen>
 
+    <para>To test the results, issue: <command>make check</command>. Note that
+    the <quote>torture load testing</quote> test uses more resources than those
+    displayed in the message prompting you to choose which test to run.</para>
+
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install</userinput></screen>

Added: trunk/patches/cups-1.1.23-testsuite_fix-1.patch
===================================================================
--- trunk/patches/cups-1.1.23-testsuite_fix-1.patch	2005-08-15 15:12:26 UTC (rev 4936)
+++ trunk/patches/cups-1.1.23-testsuite_fix-1.patch	2005-08-15 18:49:52 UTC (rev 4937)
@@ -0,0 +1,66 @@
+Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date:                    2005-08-15
+Initial Package Version: 1.1.23
+Upstream Status:         Not submitted
+Origin:                  Randy McMurchy
+Description:             Fix the Valgrind command, disable using the 'htmldoc'
+                         tool and clean up the output in the test suite script
+
+
+$LastChangedBy$
+$Date$
+
+
+--- cups-1.1.23-orig/test/run-stp-tests.sh	2005-01-03 19:30:00.000000000 +0000
++++ cups-1.1.23/test/run-stp-tests.sh	2005-08-15 04:21:24.000000000 +0000
+@@ -116,11 +116,12 @@
+ 
+ case "$usevalgrind" in
+ 	Y* | y*)
+-		valgrind="valgrind --tool=memcheck --logfile=/tmp/$user/log/valgrind --error-limit=no --leak-check=yes --trace-children=yes"
++		valgrind="valgrind --tool=memcheck --log-file=/tmp/$user/log/valgrind --error-limit=no --leak-check=yes --trace-children=yes"
+ 		echo "Using Valgrind; log files can be found in /tmp/$user/log..."
+ 		;;
+ 
+ 	*)
++		echo "Not using Valgrind"
+ 		valgrind=""
+ 		;;
+ esac
+@@ -428,7 +429,9 @@
+ 
+ echo "<H2>page_log</H2>" >>$strfile
+ echo "<PRE>" >>$strfile
+-cat /tmp/$user/log/page_log >>$strfile
++if [ -f /tmp/$user/log/page_log ]; then
++    cat /tmp/$user/log/page_log >>$strfile;
++fi
+ echo "</PRE>" >>$strfile
+ 
+ #
+@@ -442,10 +445,10 @@
+ htmlfile=`basename $strfile .shtml`.html
+ pdffile=`basename $strfile .shtml`.pdf
+ 
+-htmldoc --numbered --verbose --titleimage ../doc/images/cups-large.gif \
+-	-f $htmlfile $strfile
+-htmldoc --numbered --verbose --titleimage ../doc/images/cups-large.gif \
+-	-f $pdffile $strfile
++#htmldoc --numbered --verbose --titleimage ../doc/images/cups-large.gif \
++#	-f $htmlfile $strfile
++#htmldoc --numbered --verbose --titleimage ../doc/images/cups-large.gif \
++#	-f $pdffile $strfile
+ 
+ echo ""
+ 
+@@ -462,8 +465,8 @@
+ echo ""
+ echo "See the following files for details:"
+ echo ""
+-echo "    $htmlfile"
+-echo "    $pdffile"
++echo "    ./test/$strfile"
++#echo "    $pdffile"
+ echo ""
+ 
+ #


Property changes on: trunk/patches/cups-1.1.23-testsuite_fix-1.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date




More information about the blfs-book mailing list