]> git.ipfire.org Git - thirdparty/cups.git/blobdiff - test/run-stp-tests.sh
Fix PDF filtering.
[thirdparty/cups.git] / test / run-stp-tests.sh
index 8569bf45f3ac8d7fd2fecfb50bb2cf42cb989efc..a4d642daec2e17ca9aded215f004749d3d1822d2 100755 (executable)
@@ -1,18 +1,13 @@
 #!/bin/sh
 #
-# "$Id$"
-#
 # Perform the complete set of IPP compliance tests specified in the
 # CUPS Software Test Plan.
 #
-# Copyright 2007-2014 by Apple Inc.
-# Copyright 1997-2007 by Easy Software Products, all rights reserved.
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 1997-2007 by Easy Software Products, all rights reserved.
 #
-# These coded instructions, statements, and computer programs are the
-# property of Apple Inc. and are protected by Federal copyright
-# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-# which should have been included with this file.  If this file is
-# file is missing or damaged, see the license at "http://www.cups.org/".
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
 #
 
 argcount=$#
@@ -96,43 +91,39 @@ echo ""
 case "$testtype" in
        0)
                echo "Running in test mode (0)"
-               nprinters1=0
-               nprinters2=0
+               nprinters=0
                pjobs=0
                pprinters=0
                loglevel="debug2"
                ;;
        2)
                echo "Running the medium tests (2)"
-               nprinters1=10
-               nprinters2=20
+               nprinters=20
                pjobs=20
                pprinters=10
                loglevel="debug"
                ;;
        3)
                echo "Running the extreme tests (3)"
-               nprinters1=500
-               nprinters2=1000
+               nprinters=1000
                pjobs=100
                pprinters=50
                loglevel="debug"
                ;;
        4)
                echo "Running the torture tests (4)"
-               nprinters1=10000
-               nprinters2=20000
+               nprinters=20000
                pjobs=200
                pprinters=100
                loglevel="debug"
                ;;
        *)
                echo "Running the timid tests (1)"
-               nprinters1=0
-               nprinters2=0
+               nprinters=0
                pjobs=10
                pprinters=0
                loglevel="debug2"
+               testtype="1"
                ;;
 esac
 
@@ -142,8 +133,7 @@ esac
 
 echo ""
 echo "Now you can choose whether to create a SSL/TLS encryption key and"
-echo "certificate for testing; these tests currently require the OpenSSL"
-echo "tools:"
+echo "certificate for testing:"
 echo ""
 echo "0 - Do not do SSL/TLS encryption tests"
 echo "1 - Test but do not require encryption"
@@ -189,16 +179,20 @@ if test -z "$user"; then
        fi
 fi
 
-port=8631
+port="${CUPS_TESTPORT:=8631}"
 cwd=`pwd`
 root=`dirname $cwd`
 CUPS_TESTROOT="$root"; export CUPS_TESTROOT
 
-if test -d /private/tmp; then
-       BASE=/private/tmp/cups-$user
-else
-       BASE=/tmp/cups-$user
+BASE="${CUPS_TESTBASE:=}"
+if test -z "$BASE"; then
+       if test -d /private/tmp; then
+               BASE=/private/tmp/cups-$user
+       else
+               BASE=/tmp/cups-$user
+       fi
 fi
+export BASE
 
 #
 # Make sure that the LPDEST and PRINTER environment variables are
@@ -230,7 +224,7 @@ echo ""
 
 case "$usevalgrind" in
        Y* | y*)
-               VALGRIND="valgrind --tool=memcheck --log-file=$BASE/log/valgrind.%p --error-limit=no --leak-check=yes --trace-children=yes --read-var-info=yes"
+               VALGRIND="valgrind --tool=memcheck --log-file=$BASE/log/valgrind.%p --error-limit=no --leak-check=yes --trace-children=yes"
                if test `uname` = Darwin; then
                        VALGRIND="$VALGRIND --dsymutil=yes"
                fi
@@ -274,7 +268,7 @@ case "$usedebugprintfs" in
                echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..."
                CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
                CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL
-               CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
+               CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend|mime).*$'; export CUPS_DEBUG_FILTER
                ;;
 
        *)
@@ -302,8 +296,9 @@ for file in ../locale/cups_*.po; do
        loc=`basename $file .po | cut -c 6-`
        mkdir $BASE/share/locale/$loc
        ln -s $root/locale/cups_$loc.po $BASE/share/locale/$loc
-       ln -s $root/locale/ppdc_$loc.po $BASE/share/locale/$loc
 done
+mkdir $BASE/share/locale/en
+ln -s $root/locale/cups.pot $BASE/share/locale/en/cups_en.po
 mkdir $BASE/share/mime
 mkdir $BASE/share/model
 mkdir $BASE/share/ppdc
@@ -317,6 +312,7 @@ mkdir $BASE/ssl
 ln -s $root/backend/dnssd $BASE/bin/backend
 ln -s $root/backend/http $BASE/bin/backend
 ln -s $root/backend/ipp $BASE/bin/backend
+ln -s ipp $BASE/bin/backend/ipps
 ln -s $root/backend/lpd $BASE/bin/backend
 ln -s $root/backend/mdns $BASE/bin/backend
 ln -s $root/backend/pseudo $BASE/bin/backend
@@ -334,13 +330,30 @@ ln -s $root/filter/rastertoepson $BASE/bin/filter
 ln -s $root/filter/rastertohp $BASE/bin/filter
 ln -s $root/filter/rastertolabel $BASE/bin/filter
 ln -s $root/filter/rastertopwg $BASE/bin/filter
+cat >$BASE/share/banners/standard <<EOF
+           ==== Cover Page ====
+
+
+      Job: {?printer-name}-{?job-id}
+    Owner: {?job-originating-user-name}
+     Name: {?job-name}
+    Pages: {?job-impressions}
+
 
-ln -s $root/data/classified $BASE/share/banners
-ln -s $root/data/confidential $BASE/share/banners
-ln -s $root/data/secret $BASE/share/banners
-ln -s $root/data/standard $BASE/share/banners
-ln -s $root/data/topsecret $BASE/share/banners
-ln -s $root/data/unclassified $BASE/share/banners
+           ==== Cover Page ====
+EOF
+cat >$BASE/share/banners/classified <<EOF
+           ==== Classified - Do Not Disclose ====
+
+
+      Job: {?printer-name}-{?job-id}
+    Owner: {?job-originating-user-name}
+     Name: {?job-name}
+    Pages: {?job-impressions}
+
+
+           ==== Classified - Do Not Disclose ====
+EOF
 ln -s $root/data $BASE/share
 ln -s $root/ppdc/sample.drv $BASE/share/drv
 ln -s $root/conf/mime.types $BASE/share/mime
@@ -363,7 +376,7 @@ instfilter() {
        dst="$2"
        format="$3"
 
-       for dir in /usr/libexec/cups/filter /usr/lib/cups/filter; do
+       for dir in /usr/local/libexec/cups/filter /usr/libexec/cups/filter /usr/lib/cups/filter; do
                if test -x "$dir/$src"; then
                        ln -s "$dir/$src" "$BASE/bin/filter/$dst"
                        return
@@ -378,12 +391,15 @@ instfilter() {
                pdf)
                        cat >"$BASE/bin/filter/$dst" <<EOF
 #!/bin/sh
+trap "" TERM
+trap "" PIPE
+gziptoany "$1" "$2" "$3" "$4" "$5" \$6 >/dev/null
 case "\$5" in
        *media=a4* | *media=iso_a4* | *PageSize=A4*)
-               cat "$root/test/onepage-a4.pdf"
+               gziptoany "$1" "$2" "$3" "$4" "$5" "$root/test/onepage-a4.pdf"
                ;;
        *)
-               cat "$root/test/onepage-letter.pdf"
+               gziptoany "$1" "$2" "$3" "$4" "$5" "$root/test/onepage-letter.pdf"
                ;;
 esac
 EOF
@@ -392,12 +408,15 @@ EOF
                ps)
                        cat >"$BASE/bin/filter/$dst" <<EOF
 #!/bin/sh
+trap "" TERM
+trap "" PIPE
+gziptoany "$1" "$2" "$3" "$4" "$5" \$6 >/dev/null
 case "\$5" in
        *media=a4* | *media=iso_a4* | *PageSize=A4*)
-               cat "$root/test/onepage-a4.ps"
+               gziptoany "$1" "$2" "$3" "$4" "$5" "$root/test/onepage-a4.ps"
                ;;
        *)
-               cat "$root/test/onepage-letter.ps"
+               gziptoany "$1" "$2" "$3" "$4" "$5" "$root/test/onepage-letter.ps"
                ;;
 esac
 EOF
@@ -406,12 +425,15 @@ EOF
                raster)
                        cat >"$BASE/bin/filter/$dst" <<EOF
 #!/bin/sh
+trap "" TERM
+trap "" PIPE
+gziptoany "$1" "$2" "$3" "$4" "$5" \$6 >/dev/null
 case "\$5" in
        *media=a4* | *media=iso_a4* | *PageSize=A4*)
-               gunzip -c "$root/test/onepage-a4-300-black-1.pwg.gz"
+               gziptoany "$1" "$2" "$3" "$4" "$5" "$root/test/onepage-a4-300-black-1.pwg.gz"
                ;;
        *)
-               gunzip -c "$root/test/onepage-letter-300-black-1.pwg.gz"
+               gziptoany "$1" "$2" "$3" "$4" "$5" "$root/test/onepage-letter-300-black-1.pwg.gz"
                ;;
 esac
 EOF
@@ -421,23 +443,22 @@ EOF
 }
 
 ln -s $root/test/test.convs $BASE/share/mime
+ln -s $root/test/test.types $BASE/share/mime
 
 if test `uname` = Darwin; then
-       instfilter cgbannertopdf bannertopdf pdf
        instfilter cgimagetopdf imagetopdf pdf
        instfilter cgpdftopdf pdftopdf passthru
        instfilter cgpdftops pdftops ps
        instfilter cgpdftoraster pdftoraster raster
+       instfilter cgpdftoraster pdftourf raster
        instfilter cgtexttopdf texttopdf pdf
        instfilter pstocupsraster pstoraster raster
-       instfilter pstopdffilter pstopdf pdf
 else
-       instfilter bannertopdf bannertopdf pdf
-       instfilter bannertops bannertops ps
        instfilter imagetopdf imagetopdf pdf
        instfilter pdftopdf pdftopdf passthru
        instfilter pdftops pdftops ps
        instfilter pdftoraster pdftoraster raster
+       instfilter pdftoraster pdftourf raster
        instfilter pstoraster pstoraster raster
        instfilter texttopdf texttopdf pdf
 
@@ -458,20 +479,26 @@ else
        encryption=""
 fi
 
+if test $testtype = 0; then
+       jobhistory="30m"
+       jobfiles="5m"
+else
+       jobhistory="30"
+       jobfiles="Off"
+fi
+
 cat >$BASE/cupsd.conf <<EOF
 StrictConformance Yes
 Browsing Off
 Listen localhost:$port
 Listen $BASE/sock
-PassEnv LOCALEDIR
-PassEnv DYLD_INSERT_LIBRARIES
 MaxSubscriptions 3
 MaxLogSize 0
 AccessLogLevel actions
 LogLevel $loglevel
 LogTimeFormat usecs
-PreserveJobHistory Yes
-PreserveJobFiles No
+PreserveJobHistory $jobhistory
+PreserveJobFiles $jobfiles
 <Policy default>
 <Limit All>
 Order Allow,Deny
@@ -500,6 +527,15 @@ TempDir $BASE/spool/temp
 AccessLog $BASE/log/access_log
 ErrorLog $BASE/log/error_log
 PageLog $BASE/log/page_log
+
+PassEnv DYLD_INSERT_LIBRARIES
+PassEnv DYLD_LIBRARY_PATH
+PassEnv LD_LIBRARY_PATH
+PassEnv LD_PRELOAD
+PassEnv LOCALEDIR
+PassEnv ASAN_OPTIONS
+
+Sandboxing Off
 EOF
 
 if test $ssltype != 0 -a `uname` = Darwin; then
@@ -507,13 +543,13 @@ if test $ssltype != 0 -a `uname` = Darwin; then
 fi
 
 #
-# Setup lots of test queues - half with PPD files, half without...
+# Setup lots of test queues with PPD files...
 #
 
 echo "Creating printers.conf for test..."
 
 i=1
-while test $i -le $nprinters1; do
+while test $i -le $nprinters; do
        cat >>$BASE/printers.conf <<EOF
 <Printer test-$i>
 Accepting Yes
@@ -531,22 +567,6 @@ EOF
        i=`expr $i + 1`
 done
 
-while test $i -le $nprinters2; do
-       cat >>$BASE/printers.conf <<EOF
-<Printer test-$i>
-Accepting Yes
-DeviceURI file:/dev/null
-Info Test raw printer $i
-JobSheets none none
-Location CUPS test suite
-State Idle
-StateMessage Printer $1 is idle.
-</Printer>
-EOF
-
-       i=`expr $i + 1`
-done
-
 if test -f $BASE/printers.conf; then
        cp $BASE/printers.conf $BASE/printers.conf.orig
 else
@@ -554,48 +574,85 @@ else
 fi
 
 #
-# Setup the paths...
+# Create a helper script to run programs with...
 #
 
 echo "Setting up environment variables for test..."
 
-if test "x$LD_LIBRARY_PATH" = x; then
-       LD_LIBRARY_PATH="$root/cups:$root/filter:$root/cgi-bin:$root/scheduler:$root/ppdc"
-else
-       LD_LIBRARY_PATH="$root/cups:$root/filter:$root/cgi-bin:$root/scheduler:$root/ppdc:$LD_LIBRARY_PATH"
+if test "x$ASAN_OPTIONS" = x; then
+       # AddressSanitizer on Linux reports memory leaks from the main function
+       # which is basically useless - in general, programs do not need to free
+       # every object before exit since the OS will recover the process's
+       # memory.
+       ASAN_OPTIONS="detect_leaks=false"
+       export ASAN_OPTIONS
 fi
 
-export LD_LIBRARY_PATH
-
-LD_PRELOAD="$root/cups/libcups.so.2:$root/filter/libcupsimage.so.2:$root/cgi-bin/libcupscgi.so.1:$root/scheduler/libcupsmime.so.1:$root/ppdc/libcupsppdc.so.1"
-if test `uname` = SunOS -a -r /usr/lib/libCrun.so.1; then
-       LD_PRELOAD="/usr/lib/libCrun.so.1:$LD_PRELOAD"
-fi
-export LD_PRELOAD
+if test -f "$root/cups/libcups.so.2"; then
+       if test "x$LD_LIBRARY_PATH" = x; then
+               LD_LIBRARY_PATH="$root/cups"
+       else
+               LD_LIBRARY_PATH="$root/cups:$LD_LIBRARY_PATH"
+       fi
 
-if test "x$DYLD_LIBRARY_PATH" = x; then
-       DYLD_LIBRARY_PATH="$root/cups:$root/filter:$root/cgi-bin:$root/scheduler:$root/ppdc"
-else
-       DYLD_LIBRARY_PATH="$root/cups:$root/filter:$root/cgi-bin:$root/scheduler:$root/ppdc:$DYLD_LIBRARY_PATH"
+       LD_PRELOAD="$root/cups/libcups.so.2:$root/cups/libcupsimage.so.2"
+       if test `uname` = SunOS -a -r /usr/lib/libCrun.so.1; then
+               LD_PRELOAD="/usr/lib/libCrun.so.1:$LD_PRELOAD"
+       fi
 fi
 
-export DYLD_LIBRARY_PATH
+if test -f "$root/cups/libcups.2.dylib"; then
+       if test "x$DYLD_INSERT_LIBRARIES" = x; then
+               DYLD_INSERT_LIBRARIES="$root/cups/libcups.2.dylib:$root/cups/libcupsimage.2.dylib"
+       else
+               DYLD_INSERT_LIBRARIES="$root/cups/libcups.2.dylib:$root/cups/libcupsimage.2.dylib:$DYLD_INSERT_LIBRARIES"
+       fi
 
-if test "x$SHLIB_PATH" = x; then
-       SHLIB_PATH="$root/cups:$root/filter:$root/cgi-bin:$root/scheduler:$root/ppdc"
-else
-       SHLIB_PATH="$root/cups:$root/filter:$root/cgi-bin:$root/scheduler:$root/ppdc:$SHLIB_PATH"
+       if test "x$DYLD_LIBRARY_PATH" = x; then
+               DYLD_LIBRARY_PATH="$root/cups"
+       else
+               DYLD_LIBRARY_PATH="$root/cups:$DYLD_LIBRARY_PATH"
+       fi
 fi
 
-export SHLIB_PATH
-
+# These get exported because they don't have side-effects...
 CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT
-CUPS_SERVER=localhost:8631; export CUPS_SERVER
+CUPS_SERVER=localhost:$port; export CUPS_SERVER
 CUPS_SERVERROOT=$BASE; export CUPS_SERVERROOT
 CUPS_STATEDIR=$BASE; export CUPS_STATEDIR
 CUPS_DATADIR=$BASE/share; export CUPS_DATADIR
+IPP_PORT=$port; export IPP_PORT
 LOCALEDIR=$BASE/share/locale; export LOCALEDIR
 
+echo "Creating wrapper script..."
+
+runcups="$BASE/runcups"; export runcups
+
+echo "#!/bin/sh" >$runcups
+echo "# Helper script for running CUPS test instance." >>$runcups
+echo "" >>$runcups
+echo "# Set required environment variables..." >>$runcups
+echo "CUPS_DATADIR=\"$CUPS_DATADIR\"; export CUPS_DATADIR" >>$runcups
+echo "CUPS_SERVER=\"$CUPS_SERVER\"; export CUPS_SERVER" >>$runcups
+echo "CUPS_SERVERROOT=\"$CUPS_SERVERROOT\"; export CUPS_SERVERROOT" >>$runcups
+echo "CUPS_STATEDIR=\"$CUPS_STATEDIR\"; export CUPS_STATEDIR" >>$runcups
+echo "DYLD_INSERT_LIBRARIES=\"$DYLD_INSERT_LIBRARIES\"; export DYLD_INSERT_LIBRARIES" >>$runcups
+echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$runcups
+# IPP_PORT=$port; export IPP_PORT
+echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
+echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
+echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
+if test "x$CUPS_DEBUG_LEVEL" != x; then
+       echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
+       echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
+       echo "CUPS_DEBUG_LOG='$CUPS_DEBUG_LOG'; export CUPS_DEBUG_LOG" >>$runcups
+fi
+echo "" >>$runcups
+echo "# Run command..." >>$runcups
+echo "exec \"\$@\"" >>$runcups
+
+chmod +x $runcups
+
 #
 # Set a new home directory to avoid getting user options mixed in...
 #
@@ -618,50 +675,18 @@ export LC_MESSAGES
 #
 
 echo "Starting scheduler:"
-echo "    $VALGRIND ../scheduler/cupsd -c $BASE/cupsd.conf -f >$BASE/log/debug_log 2>&1 &"
+echo "    $runcups $VALGRIND ../scheduler/cupsd -c $BASE/cupsd.conf -f >$BASE/log/debug_log 2>&1 &"
 echo ""
 
-if test `uname` = Darwin -a "x$VALGRIND" = x; then
-       DYLD_INSERT_LIBRARIES=/usr/lib/libgmalloc.dylib
-       ../scheduler/cupsd -c $BASE/cupsd.conf -f >$BASE/log/debug_log 2>&1 &
-else
-       $VALGRIND ../scheduler/cupsd -c $BASE/cupsd.conf -f >$BASE/log/debug_log 2>&1 &
-fi
+$runcups $VALGRIND ../scheduler/cupsd -c $BASE/cupsd.conf -f >$BASE/log/debug_log 2>&1 &
 
 cupsd=$!
 
 if test "x$testtype" = x0; then
        # Not running tests...
-       echo "Scheduler is PID $cupsd and is listening on port 8631."
+       echo "Scheduler is PID $cupsd and is listening on port $port."
        echo ""
 
-       # Create a helper script to run programs with...
-       runcups="$BASE/runcups"
-
-       echo "#!/bin/sh" >$runcups
-       echo "# Helper script for running CUPS test instance." >>$runcups
-       echo "" >>$runcups
-       echo "# Set required environment variables..." >>$runcups
-       echo "CUPS_DATADIR=\"$CUPS_DATADIR\"; export CUPS_DATADIR" >>$runcups
-       echo "CUPS_SERVER=\"$CUPS_SERVER\"; export CUPS_SERVER" >>$runcups
-       echo "CUPS_SERVERROOT=\"$CUPS_SERVERROOT\"; export CUPS_SERVERROOT" >>$runcups
-       echo "CUPS_STATEDIR=\"$CUPS_STATEDIR\"; export CUPS_STATEDIR" >>$runcups
-       echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$runcups
-       echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups
-       echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups
-       echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups
-       echo "SHLIB_PATH=\"$SHLIB_PATH\"; export SHLIB_PATH" >>$runcups
-       if test "x$CUPS_DEBUG_LEVEL" != x; then
-               echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups
-               echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups
-               echo "CUPS_DEBUG_LOG='$CUPS_DEBUG_LOG'; export CUPS_DEBUG_LOG" >>$runcups
-       fi
-       echo "" >>$runcups
-       echo "# Run command..." >>$runcups
-       echo "exec \"\$@\"" >>$runcups
-
-       chmod +x $runcups
-
        echo "The $runcups helper script can be used to test programs"
        echo "with the server."
        exit 0
@@ -677,10 +702,8 @@ else
        sleep 2
 fi
 
-IPP_PORT=$port; export IPP_PORT
-
 while true; do
-       running=`../systemv/lpstat -r 2>/dev/null`
+       running=`$runcups ../systemv/lpstat -r 2>/dev/null`
        if test "x$running" = "xscheduler is running"; then
                break
        fi
@@ -694,7 +717,8 @@ done
 #
 
 date=`date "+%Y-%m-%d"`
-strfile=$BASE/cups-str-2.0-$date-$user.html
+
+strfile=$BASE/cups-str-$date-$user.html
 
 rm -f $strfile
 cat str-header.html >$strfile
@@ -706,16 +730,17 @@ cat str-header.html >$strfile
 echo ""
 echo "Running IPP compliance tests..."
 
-echo "<H1>1 - IPP Compliance Tests</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
-echo "<PRE>" >>$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 by $user on `hostname`." >>$strfile
+echo "    <pre>" >>$strfile
 
 fail=0
 for file in 4*.test ipp-2.1.test; do
        echo $ac_n "Performing $file: $ac_c"
        echo "" >>$strfile
+        echo $ac_n "`date '+[%d/%b/%Y:%H:%M:%S %z]'` $ac_c" >>$strfile
 
        if test $file = ipp-2.1.test; then
                uri="ipp://localhost:$port/printers/Test1"
@@ -724,7 +749,7 @@ for file in 4*.test ipp-2.1.test; do
                uri="ipp://localhost:$port/printers"
                options=""
        fi
-       $VALGRIND ./ipptool -tI $options $uri $file >> $strfile
+       $runcups $VALGRIND ./ipptool -tI $options $uri $file >> $strfile
        status=$?
 
        if test $status != 0; then
@@ -735,7 +760,7 @@ for file in 4*.test ipp-2.1.test; do
        fi
 done
 
-echo "</PRE>" >>$strfile
+echo "    </pre>" >>$strfile
 
 #
 # Run the command tests...
@@ -744,16 +769,16 @@ echo "</PRE>" >>$strfile
 echo ""
 echo "Running command tests..."
 
-echo "<H1>2 - Command Tests</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
-echo "<PRE>" >>$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
+echo "    <pre>" >>$strfile
 
 for file in 5*.sh; do
        echo $ac_n "Performing $file: $ac_c"
        echo "" >>$strfile
-       echo "\"$file\":" >>$strfile
+        echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"$file\":" >>$strfile
 
        sh $file $pjobs $pprinters >> $strfile
        status=$?
@@ -766,19 +791,102 @@ for file in 5*.sh; do
        fi
 done
 
-echo "</PRE>" >>$strfile
+#
+# Restart the server...
+#
+
+echo $ac_n "Performing restart test: $ac_c"
+echo "" >>$strfile
+echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"5.10-restart\":" >>$strfile
+
+kill -HUP $cupsd
+
+while true; do
+       sleep 10
+
+       running=`$runcups ../systemv/lpstat -r 2>/dev/null`
+       if test "x$running" = "xscheduler is running"; then
+               break
+       fi
+done
+
+description="`$runcups ../systemv/lpstat -l -p Test1 | grep Description | sed -e '1,$s/^[^:]*: //g'`"
+if test "x$description" != "xTest Printer 1"; then
+       echo "Failed, printer-info for Test1 is '$description', expected 'Test Printer 1'." >>$strfile
+       echo "FAIL (got '$description', expected 'Test Printer 1')"
+       fail=`expr $fail + 1`
+else
+       echo "Passed." >>$strfile
+       echo PASS
+fi
+
 
 #
-# Stop the server...
+# Perform job history test...
 #
 
-kill $cupsd
+echo $ac_n "Starting history test: $ac_c"
+echo "" >>$strfile
+echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"5.11-history\":" >>$strfile
+
+echo "    lp -d Test1 testfile.jpg" >>$strfile
+
+$runcups ../systemv/lp -d Test1 testfile.jpg 2>&1 >>$strfile
+if test $? != 0; then
+       echo "FAIL (unable to queue test job)"
+       echo "    FAILED" >>$strfile
+       fail=`expr $fail + 1`
+else
+       echo "PASS"
+       echo "    PASSED" >>$strfile
+
+       ./waitjobs.sh >>$strfile
+
+        echo $ac_n "Verifying that history still exists: $ac_c"
+
+       echo "    ls -l $BASE/spool" >>$strfile
+       count=`ls -1 $BASE/spool | wc -l`
+       if test $count = 1; then
+               echo "FAIL"
+               echo "    FAILED (job control files not present)" >>$strfile
+               ls -l $BASE/spool >>$strfile
+               fail=`expr $fail + 1`
+       else
+               echo "PASS"
+               echo "    PASSED" >>$strfile
+
+               echo $ac_n "Waiting for job history to expire: $ac_c"
+               echo "" >>$strfile
+               echo "    sleep 35" >>$strfile
+               sleep 35
+
+               echo "    lpstat" >>$strfile
+               $runcups ../systemv/lpstat 2>&1 >>$strfile
+
+               echo "    ls -l $BASE/spool" >>$strfile
+               count=`ls -1 $BASE/spool | wc -l`
+               if test $count != 1; then
+                       echo "FAIL"
+                       echo "    FAILED (job control files still present)" >>$strfile
+                       ls -l $BASE/spool >>$strfile
+                       fail=`expr $fail + 1`
+               else
+                       echo "PASS"
+                       echo "    PASSED" >>$strfile
+               fi
+       fi
+fi
+
 
 #
-# Append the log files for post-mortim...
+# Stop the server...
 #
 
-echo "<H1>3 - Log Files</H1>" >>$strfile
+echo "    </pre>" >>$strfile
+
+kill $cupsd
+wait $cupsd
+cupsdstatus=$?
 
 #
 # Verify counts...
@@ -786,18 +894,27 @@ 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`
 count=`expr $count - 1`
 if test $count != 0; then
        echo "FAIL: $count job control files were not purged."
-       echo "<P>FAIL: $count job control files were not purged.</P>" >>$strfile
+       echo "    <p>FAIL: $count job control files were not purged.</p>" >>$strfile
        fail=`expr $fail + 1`
 else
        echo "PASS: All job control files purged."
-       echo "<P>PASS: All job control files purged.</P>" >>$strfile
+       echo "    <p>PASS: All job control files purged.</p>" >>$strfile
 fi
 
 # Pages printed on Test1 (within 1 page for timing-dependent cancel issues)
@@ -806,11 +923,11 @@ expected=`expr $pjobs \* 2 + 34`
 expected2=`expr $expected + 2`
 if test $count -lt $expected -a $count -gt $expected2; then
        echo "FAIL: Printer 'Test1' produced $count page(s), expected $expected."
-       echo "<P>FAIL: Printer 'Test1' produced $count page(s), expected $expected.</P>" >>$strfile
+       echo "    <p>FAIL: Printer 'Test1' produced $count page(s), expected $expected.</p>" >>$strfile
        fail=`expr $fail + 1`
 else
        echo "PASS: Printer 'Test1' correctly produced $count page(s)."
-       echo "<P>PASS: Printer 'Test1' correctly produced $count page(s).</P>" >>$strfile
+       echo "    <p>PASS: Printer 'Test1' correctly produced $count page(s).</p>" >>$strfile
 fi
 
 # Paged printed on Test2
@@ -818,48 +935,48 @@ count=`$GREP '^Test2 ' $BASE/log/page_log | awk 'BEGIN{count=0}{count=count+$7}E
 expected=`expr $pjobs \* 2 + 3`
 if test $count != $expected; then
        echo "FAIL: Printer 'Test2' produced $count page(s), expected $expected."
-       echo "<P>FAIL: Printer 'Test2' produced $count page(s), expected $expected.</P>" >>$strfile
+       echo "    <p>FAIL: Printer 'Test2' produced $count page(s), expected $expected.</p>" >>$strfile
        fail=`expr $fail + 1`
 else
        echo "PASS: Printer 'Test2' correctly produced $count page(s)."
-       echo "<P>PASS: Printer 'Test2' correctly produced $count page(s).</P>" >>$strfile
+       echo "    <p>PASS: Printer 'Test2' correctly produced $count page(s).</p>" >>$strfile
 fi
 
 # Paged printed on Test3
-count=`$GREP '^Test3 ' $BASE/log/page_log | grep -v total | awk 'BEGIN{count=0}{count=count+$7}END{print count}'`
+count=`$GREP '^Test3 ' $BASE/log/page_log | awk 'BEGIN{count=0}{count=count+$7}END{print count}'`
 expected=2
 if test $count != $expected; then
        echo "FAIL: Printer 'Test3' produced $count page(s), expected $expected."
-       echo "<P>FAIL: Printer 'Test3' produced $count page(s), expected $expected.</P>" >>$strfile
+       echo "    <p>FAIL: Printer 'Test3' produced $count page(s), expected $expected.</p>" >>$strfile
        fail=`expr $fail + 1`
 else
        echo "PASS: Printer 'Test3' correctly produced $count page(s)."
-       echo "<P>PASS: Printer 'Test3' correctly produced $count page(s).</P>" >>$strfile
+       echo "    <p>PASS: Printer 'Test3' correctly produced $count page(s).</p>" >>$strfile
 fi
 
 # Requests logged
 count=`wc -l $BASE/log/access_log | awk '{print $1}'`
-expected=`expr 37 + 18 + 28 + $pjobs \* 8 + $pprinters \* $pjobs \* 4`
+expected=`expr 35 + 18 + 30 + $pjobs \* 8 + $pprinters \* $pjobs \* 4 + 2`
 if test $count != $expected; then
        echo "FAIL: $count requests logged, expected $expected."
-       echo "<P>FAIL: $count requests logged, expected $expected.</P>" >>$strfile
+       echo "    <p>FAIL: $count requests logged, expected $expected.</p>" >>$strfile
        fail=`expr $fail + 1`
 else
        echo "PASS: $count requests logged."
-       echo "<P>PASS: $count requests logged.</P>" >>$strfile
+       echo "    <p>PASS: $count requests logged.</p>" >>$strfile
 fi
 
 # Did CUPS-Get-Default get logged?
 if $GREP -q CUPS-Get-Default $BASE/log/access_log; then
        echo "FAIL: CUPS-Get-Default logged with 'AccessLogLevel actions'"
-       echo "<P>FAIL: CUPS-Get-Default logged with 'AccessLogLevel actions'</P>" >>$strfile
-       echo "<PRE>" >>$strfile
+       echo "    <p>FAIL: CUPS-Get-Default logged with 'AccessLogLevel actions'</p>" >>$strfile
+       echo "    <pre>" >>$strfile
        $GREP CUPS-Get-Default $BASE/log/access_log | sed -e '1,$s/&/&amp;/g' -e '1,$s/</&lt;/g' >>$strfile
-       echo "</PRE>" >>$strfile
+       echo "    </pre>" >>$strfile
        fail=`expr $fail + 1`
 else
        echo "PASS: CUPS-Get-Default not logged."
-       echo "<P>PASS: CUPS-Get-Default not logged.</P>" >>$strfile
+       echo "    <p>PASS: CUPS-Get-Default not logged.</p>" >>$strfile
 fi
 
 # Emergency log messages
@@ -867,14 +984,14 @@ count=`$GREP '^X ' $BASE/log/error_log | wc -l | awk '{print $1}'`
 if test $count != 0; then
        echo "FAIL: $count emergency messages, expected 0."
        $GREP '^X ' $BASE/log/error_log
-       echo "<P>FAIL: $count emergency messages, expected 0.</P>" >>$strfile
-       echo "<PRE>" >>$strfile
+       echo "    <p>FAIL: $count emergency messages, expected 0.</p>" >>$strfile
+       echo "    <pre>" >>$strfile
        $GREP '^X ' $BASE/log/error_log | sed -e '1,$s/&/&amp;/g' -e '1,$s/</&lt;/g' >>$strfile
-       echo "</PRE>" >>$strfile
+       echo "    </pre>" >>$strfile
        fail=`expr $fail + 1`
 else
        echo "PASS: $count emergency messages."
-       echo "<P>PASS: $count emergency messages.</P>" >>$strfile
+       echo "    <p>PASS: $count emergency messages.</p>" >>$strfile
 fi
 
 # Alert log messages
@@ -882,14 +999,14 @@ count=`$GREP '^A ' $BASE/log/error_log | wc -l | awk '{print $1}'`
 if test $count != 0; then
        echo "FAIL: $count alert messages, expected 0."
        $GREP '^A ' $BASE/log/error_log
-       echo "<P>FAIL: $count alert messages, expected 0.</P>" >>$strfile
-       echo "<PRE>" >>$strfile
+       echo "    <p>FAIL: $count alert messages, expected 0.</p>" >>$strfile
+       echo "    <pre>" >>$strfile
        $GREP '^A ' $BASE/log/error_log | sed -e '1,$s/&/&amp;/g' -e '1,$s/</&lt;/g' >>$strfile
-       echo "</PRE>" >>$strfile
+       echo "    </pre>" >>$strfile
        fail=`expr $fail + 1`
 else
        echo "PASS: $count alert messages."
-       echo "<P>PASS: $count alert messages.</P>" >>$strfile
+       echo "    <p>PASS: $count alert messages.</p>" >>$strfile
 fi
 
 # Critical log messages
@@ -897,44 +1014,44 @@ count=`$GREP '^C ' $BASE/log/error_log | wc -l | awk '{print $1}'`
 if test $count != 0; then
        echo "FAIL: $count critical messages, expected 0."
        $GREP '^C ' $BASE/log/error_log
-       echo "<P>FAIL: $count critical messages, expected 0.</P>" >>$strfile
-       echo "<PRE>" >>$strfile
+       echo "    <p>FAIL: $count critical messages, expected 0.</p>" >>$strfile
+       echo "    <pre>" >>$strfile
        $GREP '^C ' $BASE/log/error_log | sed -e '1,$s/&/&amp;/g' -e '1,$s/</&lt;/g' >>$strfile
-       echo "</PRE>" >>$strfile
+       echo "    </pre>" >>$strfile
        fail=`expr $fail + 1`
 else
        echo "PASS: $count critical messages."
-       echo "<P>PASS: $count critical messages.</P>" >>$strfile
+       echo "    <p>PASS: $count critical messages.</p>" >>$strfile
 fi
 
 # Error log messages
-count=`$GREP '^E ' $BASE/log/error_log | wc -l | awk '{print $1}'`
+count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
 if test $count != 33; then
        echo "FAIL: $count error messages, expected 33."
        $GREP '^E ' $BASE/log/error_log
-       echo "<P>FAIL: $count error messages, expected 33.</P>" >>$strfile
-       echo "<PRE>" >>$strfile
+       echo "    <p>FAIL: $count error messages, expected 33.</p>" >>$strfile
+       echo "    <pre>" >>$strfile
        $GREP '^E ' $BASE/log/error_log | sed -e '1,$s/&/&amp;/g' -e '1,$s/</&lt;/g' >>$strfile
-       echo "</PRE>" >>$strfile
+       echo "    </pre>" >>$strfile
        fail=`expr $fail + 1`
 else
        echo "PASS: $count error messages."
-       echo "<P>PASS: $count error messages.</P>" >>$strfile
+       echo "    <p>PASS: $count error messages.</p>" >>$strfile
 fi
 
 # Warning log messages
 count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
-if test $count != 9; then
-       echo "FAIL: $count warning messages, expected 9."
+if test $count != 8; then
+       echo "FAIL: $count warning messages, expected 8."
        $GREP '^W ' $BASE/log/error_log
-       echo "<P>FAIL: $count warning messages, expected 9.</P>" >>$strfile
-       echo "<PRE>" >>$strfile
+       echo "    <p>FAIL: $count warning messages, expected 8.</p>" >>$strfile
+       echo "    <pre>" >>$strfile
        $GREP '^W ' $BASE/log/error_log | sed -e '1,$s/&/&amp;/g' -e '1,$s/</&lt;/g' >>$strfile
-       echo "</PRE>" >>$strfile
+       echo "    </pre>" >>$strfile
        fail=`expr $fail + 1`
 else
        echo "PASS: $count warning messages."
-       echo "<P>PASS: $count warning messages.</P>" >>$strfile
+       echo "    <p>PASS: $count warning messages.</p>" >>$strfile
 fi
 
 # Notice log messages
@@ -942,64 +1059,78 @@ count=`$GREP '^N ' $BASE/log/error_log | wc -l | awk '{print $1}'`
 if test $count != 0; then
        echo "FAIL: $count notice messages, expected 0."
        $GREP '^N ' $BASE/log/error_log
-       echo "<P>FAIL: $count notice messages, expected 0.</P>" >>$strfile
-       echo "<PRE>" >>$strfile
+       echo "    <p>FAIL: $count notice messages, expected 0.</p>" >>$strfile
+       echo "    <pre>" >>$strfile
        $GREP '^N ' $BASE/log/error_log | sed -e '1,$s/&/&amp;/g' -e '1,$s/</&lt;/g' >>$strfile
-       echo "</PRE>" >>$strfile
+       echo "    </pre>" >>$strfile
        fail=`expr $fail + 1`
 else
        echo "PASS: $count notice messages."
-       echo "<P>PASS: $count notice messages.</P>" >>$strfile
+       echo "    <p>PASS: $count notice messages.</p>" >>$strfile
 fi
 
 # Info log messages
 count=`$GREP '^I ' $BASE/log/error_log | wc -l | awk '{print $1}'`
 if test $count = 0; then
        echo "FAIL: $count info messages, expected more than 0."
-       echo "<P>FAIL: $count info messages, expected more than 0.</P>" >>$strfile
+       echo "    <p>FAIL: $count info messages, expected more than 0.</p>" >>$strfile
        fail=`expr $fail + 1`
 else
        echo "PASS: $count info messages."
-       echo "<P>PASS: $count info messages.</P>" >>$strfile
+       echo "    <p>PASS: $count info messages.</p>" >>$strfile
 fi
 
 # Debug log messages
 count=`$GREP '^D ' $BASE/log/error_log | wc -l | awk '{print $1}'`
 if test $count = 0; then
        echo "FAIL: $count debug messages, expected more than 0."
-       echo "<P>FAIL: $count debug messages, expected more than 0.</P>" >>$strfile
+       echo "    <p>FAIL: $count debug messages, expected more than 0.</p>" >>$strfile
        fail=`expr $fail + 1`
 else
        echo "PASS: $count debug messages."
-       echo "<P>PASS: $count debug messages.</P>" >>$strfile
+       echo "    <p>PASS: $count debug messages.</p>" >>$strfile
 fi
 
 # Debug2 log messages
 count=`$GREP '^d ' $BASE/log/error_log | wc -l | awk '{print $1}'`
-if test $count = 0; then
+if test $count = 0 -a $loglevel = debug2; then
        echo "FAIL: $count debug2 messages, expected more than 0."
-       echo "<P>FAIL: $count debug2 messages, expected more than 0.</P>" >>$strfile
+       echo "    <p>FAIL: $count debug2 messages, expected more than 0.</p>" >>$strfile
+       fail=`expr $fail + 1`
+elif test $count != 0 -a $loglevel = debug; then
+       echo "FAIL: $count debug2 messages, expected 0."
+       echo "    <p>FAIL: $count debug2 messages, expected 0.</p>" >>$strfile
        fail=`expr $fail + 1`
 else
        echo "PASS: $count debug2 messages."
-       echo "<P>PASS: $count debug2 messages.</P>" >>$strfile
+       echo "    <p>PASS: $count debug2 messages.</p>" >>$strfile
 fi
 
+#
 # Log files...
-echo "<H2>access_log</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 "<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 "<PRE>" >>$strfile
-sed -e '1,$s/&/&amp;/g' -e '1,$s/</&lt;/g' $BASE/log/page_log >>$strfile
-echo "</PRE>" >>$strfile
+echo "    <h1><a name='LOGS'>4 - Log Files</a></h1>" >>$strfile
+
+for file in $BASE/log/*_log; do
+        baselog=`basename $file`
+
+        echo "    <h2><a name=\"$baselog\">$baselog</a></h2>" >>$strfile
+        case $baselog in
+                error_log)
+                        echo "    <blockquote>Note: debug2 messages have been filtered out of the HTML report.</blockquote>" >>$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 "    <pre>" >>$strfile
+                        sed -e '1,$s/&/&amp;/g' -e '1,$s/</&lt;/g' $file >>$strfile
+                        echo "    </pre>" >>$strfile
+                        ;;
+        esac
+done
 
 #
 # Format the reports and tell the user where to find them...
@@ -1008,27 +1139,23 @@ echo "</PRE>" >>$strfile
 cat str-trailer.html >>$strfile
 
 echo ""
+for file in $BASE/log/*_log; do
+        baselog=`basename $file`
+        cp $file $baselog-$date-$user
+        echo "Copied log file \"$baselog-$date-$user\" to test directory."
+done
+cp $strfile .
+echo "Copied report file \"cups-str-$date-$user.html\" to test directory."
 
-if test $fail != 0; then
-       echo "$fail tests failed."
-       cp $BASE/log/error_log error_log-$date-$user
-       cp $strfile .
-else
-       echo "All tests were successful."
-fi
+# Clean out old failure log files after 1 week...
+find . -name \*_log-\*-$user -a -mtime +7 -print -exec rm -f '{}' \; | awk '{print "Removed old log file \"" substr($1,3) "\" from test directory."}'
+find . -name cups-str-\*-$user.html -a -mtime +7 -print -exec rm -f '{}' \; | awk '{print "Removed old report file \"" $1 "\" from test directory."}'
 
-echo "Log files can be found in $BASE/log."
-echo "A HTML report was created in $strfile."
 echo ""
 
 if test $fail != 0; then
-       echo "Copies of the error_log and `basename $strfile` files are in"
-       echo "`pwd`."
-       echo ""
-
+       echo "$fail tests failed."
        exit 1
+else
+       echo "All tests were successful."
 fi
-
-#
-# End of "$Id$"
-#