Fix test suite with shared libraries on macOS.

diff --git a/scheduler/env.c b/scheduler/env.c
index 13b72412a4c230895ac64afcbe235a14b4f0de67..71ab98d6b8b642f704e061a77d2fa4dd46bf3d39 100644 (file)
--- a/scheduler/env.c
+++ b/scheduler/env.c
@@ -201,6 +201,7 @@ cupsdUpdateEnv(void)
   set_if_undefined("CUPS_SERVERBIN", ServerBin);
   set_if_undefined("CUPS_SERVERROOT", ServerRoot);
   set_if_undefined("CUPS_STATEDIR", StateDir);
+  set_if_undefined("DYLD_INSERT_LIBRARIES", NULL);
   set_if_undefined("DYLD_LIBRARY_PATH", NULL);
   set_if_undefined("HOME", TempDir);
   set_if_undefined("LD_ASSUME_KERNEL", NULL);

diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
index 612607bd802cd1a526cdee31ec5316b5f665e0d0..7efc398924e16d8f844625b59f9215c743b09246 100644 (file)
--- a/test/5.1-lpadmin.sh
+++ b/test/5.1-lpadmin.sh
@@ -12,7 +12,7 @@
 echo "Add Printer Test"
 echo ""
 echo "    lpadmin -p Test3 -v file:/dev/null -E -m drv:///sample.drv/deskjet.ppd"
-$VALGRIND ../systemv/lpadmin -p Test3 -v file:/dev/null -E -m drv:///sample.drv/deskjet.ppd 2>&1
+$runcups $VALGRIND ../systemv/lpadmin -p Test3 -v file:/dev/null -E -m drv:///sample.drv/deskjet.ppd 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1
@@ -29,7 +29,7 @@ echo ""
 echo "Modify Printer Test"
 echo ""
 echo "    lpadmin -p Test3 -v file:/tmp/Test3 -o PageSize=A4"
-$VALGRIND ../systemv/lpadmin -p Test3 -v file:/tmp/Test3 -o PageSize=A4 2>&1
+$runcups $VALGRIND ../systemv/lpadmin -p Test3 -v file:/tmp/Test3 -o PageSize=A4 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1
@@ -41,7 +41,7 @@ echo ""
 echo "Delete Printer Test"
 echo ""
 echo "    lpadmin -x Test3"
-$VALGRIND ../systemv/lpadmin -x Test3 2>&1
+$runcups $VALGRIND ../systemv/lpadmin -x Test3 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1
@@ -53,7 +53,7 @@ echo ""
 echo "Add Shared Printer Test"
 echo ""
 echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
-$VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
+$runcups $VALGRIND ../systemv/lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1

diff --git a/test/5.2-lpc.sh b/test/5.2-lpc.sh
index d3766e91bc81cd32a0ba143619faa72eb30910a1..155a15764e99eb81f1487bc3e1a70c2163b23721 100644 (file)
--- a/test/5.2-lpc.sh
+++ b/test/5.2-lpc.sh
@@ -12,7 +12,7 @@
 echo "LPC Test"
 echo ""
 echo "    lpc status"
-$VALGRIND ../berkeley/lpc status 2>&1
+$runcups $VALGRIND ../berkeley/lpc status 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1

diff --git a/test/5.3-lpq.sh b/test/5.3-lpq.sh
index 4b0e067851192737683e5976db80c6f8973798f5..02ddbd96f3e67f11020baf97021a9c1c7b8e591c 100644 (file)
--- a/test/5.3-lpq.sh
+++ b/test/5.3-lpq.sh
@@ -12,7 +12,7 @@
 echo "LPQ Test"
 echo ""
 echo "    lpq -P Test1"
-$VALGRIND ../berkeley/lpq -P Test1 2>&1
+$runcups $VALGRIND ../berkeley/lpq -P Test1 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1

diff --git a/test/5.4-lpstat.sh b/test/5.4-lpstat.sh
index 05a7d25722d40558281f09fdd16345579e459742..ba5246dfc68fe505694e1d1dd7c4b7f8b3d9215e 100644 (file)
--- a/test/5.4-lpstat.sh
+++ b/test/5.4-lpstat.sh
@@ -12,7 +12,7 @@
 echo "LPSTAT Basic Test"
 echo ""
 echo "    lpstat -t"
-$VALGRIND ../systemv/lpstat -t 2>&1
+$runcups $VALGRIND ../systemv/lpstat -t 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1
@@ -24,7 +24,7 @@ echo ""
 echo "LPSTAT Enumeration Test"
 echo ""
 echo "    lpstat -e"
-printers="`$VALGRIND ../systemv/lpstat -e 2>&1`"
+printers="`$runcups $VALGRIND ../systemv/lpstat -e 2>&1`"
 if test $? != 0 -o "x$printers" = x; then
        echo "    FAILED"
        exit 1
@@ -39,7 +39,7 @@ echo ""
 echo "LPSTAT Get Host Test"
 echo ""
 echo "    lpstat -H"
-server="`$VALGRIND ../systemv/lpstat -H 2>&1`"
+server="`$runcups $VALGRIND ../systemv/lpstat -H 2>&1`"
 if test $? != 0 -o "x$server" != x$CUPS_SERVER; then
        echo "    FAILED ($server)"
        exit 1

diff --git a/test/5.5-lp.sh b/test/5.5-lp.sh
index d7e7d7d0ef2544738869cfde22d7b59e317d1c0e..ba7c5f91bf868efd603852d753c9fe775f14239a 100644 (file)
--- a/test/5.5-lp.sh
+++ b/test/5.5-lp.sh
@@ -12,7 +12,7 @@
 echo "LP Default Test"
 echo ""
 echo "    lp testfile.pdf"
-$VALGRIND ../systemv/lp testfile.pdf 2>&1
+$runcups $VALGRIND ../systemv/lp testfile.pdf 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1
@@ -24,7 +24,7 @@ echo ""
 echo "LP Destination Test"
 echo ""
 echo "    lp -d Test3 -o fit-to-page testfile.jpg"
-$VALGRIND ../systemv/lp -d Test3 -o fit-to-page testfile.jpg 2>&1
+$runcups $VALGRIND ../systemv/lp -d Test3 -o fit-to-page testfile.jpg 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1
@@ -36,7 +36,7 @@ echo ""
 echo "LP Options Test"
 echo ""
 echo "    lp -d Test1 -P 1-4 -o job-sheets=classified,classified testfile.pdf"
-$VALGRIND ../systemv/lp -d Test1 -P 1-4 -o job-sheets=classified,classified testfile.pdf 2>&1
+$runcups $VALGRIND ../systemv/lp -d Test1 -P 1-4 -o job-sheets=classified,classified testfile.pdf 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1
@@ -54,13 +54,13 @@ pids=""
 while test $i -lt $1; do
        j=1
        while test $j -le $2; do
-               $VALGRIND ../systemv/lp -d test-$j testfile.jpg 2>&1
+               $runcups $VALGRIND ../systemv/lp -d test-$j testfile.jpg 2>&1
                j=`expr $j + 1`
        done
 
-       $VALGRIND ../systemv/lp -d Test1 testfile.jpg 2>&1 &
+       $runcups $VALGRIND ../systemv/lp -d Test1 testfile.jpg 2>&1 &
        pids="$pids $!"
-       $VALGRIND ../systemv/lp -d Test2 testfile.jpg 2>&1 &
+       $runcups $VALGRIND ../systemv/lp -d Test2 testfile.jpg 2>&1 &
        pids="$pids $!"
 
        i=`expr $i + 1`
@@ -79,7 +79,7 @@ echo ""
 echo "LPSTAT Completed Jobs Order Test"
 echo ""
 echo "    lpstat -W completed -o"
-$VALGRIND ../systemv/lpstat -W completed -o | tee $BASE/lpstat-completed.txt
+$runcups $VALGRIND ../systemv/lpstat -W completed -o | tee $BASE/lpstat-completed.txt
 if test "`uniq -d $BASE/lpstat-completed.txt`" != ""; then
        echo "    FAILED"
        exit 1

diff --git a/test/5.6-lpr.sh b/test/5.6-lpr.sh
index 39d822bf6a03085f742c25cadde45568bba654cf..1a1908349ee2e6c6175c76bbcd709c075b2f1e8f 100644 (file)
--- a/test/5.6-lpr.sh
+++ b/test/5.6-lpr.sh
@@ -12,7 +12,7 @@
 echo "LPR Default Test"
 echo ""
 echo "    lpr testfile.pdf"
-$VALGRIND ../berkeley/lpr testfile.pdf 2>&1
+$runcups $VALGRIND ../berkeley/lpr testfile.pdf 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1
@@ -24,7 +24,7 @@ echo ""
 echo "LPR Destination Test"
 echo ""
 echo "    lpr -P Test3 -o fit-to-page testfile.jpg"
-$VALGRIND ../berkeley/lpr -P Test3 -o fit-to-page testfile.jpg 2>&1
+$runcups $VALGRIND ../berkeley/lpr -P Test3 -o fit-to-page testfile.jpg 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1
@@ -36,7 +36,7 @@ echo ""
 echo "LPR Options Test"
 echo ""
 echo "    lpr -P Test1 -o number-up=4 -o job-sheets=standard,none testfile.pdf"
-$VALGRIND ../berkeley/lpr -P Test1 -o number-up=4 -o job-sheets=standard,none testfile.pdf 2>&1
+$runcups $VALGRIND ../berkeley/lpr -P Test1 -o number-up=4 -o job-sheets=standard,none testfile.pdf 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1
@@ -54,13 +54,13 @@ pids=""
 while test $i -lt $1; do
        j=1
        while test $j -le $2; do
-               $VALGRIND ../berkeley/lpr -P test-$j testfile.jpg 2>&1
+               $runcups $VALGRIND ../berkeley/lpr -P test-$j testfile.jpg 2>&1
                j=`expr $j + 1`
        done
 
-       $VALGRIND ../berkeley/lpr -P Test1 testfile.jpg 2>&1 &
+       $runcups $VALGRIND ../berkeley/lpr -P Test1 testfile.jpg 2>&1 &
        pids="$pids $!"
-       $VALGRIND ../berkeley/lpr -P Test2 testfile.jpg 2>&1 &
+       $runcups $VALGRIND ../berkeley/lpr -P Test2 testfile.jpg 2>&1 &
        pids="$pids $!"
 
        i=`expr $i + 1`

diff --git a/test/5.7-lprm.sh b/test/5.7-lprm.sh
index 7262551f7ff6baf0bb3f327d4eb64e4264436189..29251f943af2a5a677043ee67130837eaa279b57 100644 (file)
--- a/test/5.7-lprm.sh
+++ b/test/5.7-lprm.sh
@@ -12,9 +12,9 @@
 echo "LPRM Current Test"
 echo ""
 echo "    lpr -o job-hold-until=indefinite testfile.jpg"
-$VALGRIND ../berkeley/lpr -o job-hold-until=indefinite testfile.jpg 2>&1
+$runcups $VALGRIND ../berkeley/lpr -o job-hold-until=indefinite testfile.jpg 2>&1
 echo "    lprm"
-$VALGRIND ../berkeley/lprm 2>&1
+$runcups $VALGRIND ../berkeley/lprm 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1
@@ -26,9 +26,9 @@ echo ""
 echo "LPRM Destination Test"
 echo ""
 echo "    lpr -P Test1 -o job-hold-until=indefinite testfile.jpg"
-$VALGRIND ../berkeley/lpr -P Test1 -o job-hold-until=indefinite testfile.jpg 2>&1
+$runcups $VALGRIND ../berkeley/lpr -P Test1 -o job-hold-until=indefinite testfile.jpg 2>&1
 echo "    lprm Test1"
-$VALGRIND ../berkeley/lprm Test1 2>&1
+$runcups $VALGRIND ../berkeley/lprm Test1 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1

diff --git a/test/5.8-cancel.sh b/test/5.8-cancel.sh
index 07b9f2530c96f9a4ff5be8604b7649c7f6a4e7e3..bd7cf5fbbdf7a7806bc7fd34c07edf87e3829264 100644 (file)
--- a/test/5.8-cancel.sh
+++ b/test/5.8-cancel.sh
@@ -12,9 +12,9 @@
 echo "Cancel Destination Test"
 echo ""
 echo "    lp -d Test1 -o job-hold-until=indefinite testfile.jpg"
-$VALGRIND ../systemv/lp -d Test1 -o job-hold-until=indefinite testfile.jpg 2>&1
+$runcups $VALGRIND ../systemv/lp -d Test1 -o job-hold-until=indefinite testfile.jpg 2>&1
 echo "    cancel Test1"
-$VALGRIND ../systemv/cancel Test1 2>&1
+$runcups $VALGRIND ../systemv/cancel Test1 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1
@@ -26,7 +26,7 @@ echo ""
 echo "Cancel All Test"
 echo ""
 echo "    cancel -a"
-$VALGRIND ../systemv/cancel -a 2>&1
+$runcups $VALGRIND ../systemv/cancel -a 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1
@@ -38,7 +38,7 @@ echo ""
 echo "Purge All Test"
 echo ""
 echo "    cancel -a -x"
-$VALGRIND ../systemv/cancel -a -x 2>&1
+$runcups $VALGRIND ../systemv/cancel -a -x 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1

diff --git a/test/5.9-lpinfo.sh b/test/5.9-lpinfo.sh
index fdbb99dc33b2ed20a81c26d16d9f0be7adbfc631..7d67fe3e06503bc41815cce6cad6164d52589718 100644 (file)
--- a/test/5.9-lpinfo.sh
+++ b/test/5.9-lpinfo.sh
@@ -12,7 +12,7 @@
 echo "LPINFO Devices Test"
 echo ""
 echo "    lpinfo -v"
-$VALGRIND ../systemv/lpinfo -v 2>&1
+$runcups $VALGRIND ../systemv/lpinfo -v 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1
@@ -24,7 +24,7 @@ echo ""
 echo "LPINFO Drivers Test"
 echo ""
 echo "    lpinfo -m"
-$VALGRIND ../systemv/lpinfo -m 2>&1
+$runcups $VALGRIND ../systemv/lpinfo -m 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1
@@ -36,7 +36,7 @@ echo ""
 echo "LPINFO Drivers Test"
 echo ""
 echo "    lpinfo -m | grep -q sample.drv"
-$VALGRIND ../systemv/lpinfo -m | grep -q sample.drv 2>&1
+$runcups $VALGRIND ../systemv/lpinfo -m | grep -q sample.drv 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index ae902972330b7705c18a61e3fee0602d73000749..74157129cf5f6b6183b1ea36d3f8dc6d19128c51 100755 (executable)
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -520,6 +520,7 @@ 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
@@ -563,7 +564,7 @@ else
 fi
 
 #
-# Setup the paths...
+# Create a helper script to run programs with...
 #
 
 echo "Setting up environment variables for test..."
@@ -574,13 +575,10 @@ else
        LD_LIBRARY_PATH="$root/cups:$root/filter:$root/cgi-bin:$root/scheduler:$root/ppdc:$LD_LIBRARY_PATH"
 fi
 
-export LD_LIBRARY_PATH
-
 LD_PRELOAD="$root/cups/libcups.so.2:$root/cups/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.2.dylib; then
         if test "x$DYLD_INSERT_LIBRARIES" = x; then
@@ -588,8 +586,6 @@ if test -f $root/cups/libcups.2.dylib; then
         else
                 DYLD_INSERT_LIBRARIES="$root/cups/libcups.2.dylib:$root/cups/libcupsimage.2.dylib:$root/cgi-bin/libcupscgi.1.dylib:$root/scheduler/libcupsmime.1.dylib:$root/ppdc/libcupsppdc.1.dylib:$DYLD_INSERT_LIBRARIES"
         fi
-
-        export DYLD_INSERT_LIBRARIES
 fi
 
 if test "x$DYLD_LIBRARY_PATH" = x; then
@@ -598,23 +594,51 @@ else
        DYLD_LIBRARY_PATH="$root/cups:$root/filter:$root/cgi-bin:$root/scheduler:$root/ppdc:$DYLD_LIBRARY_PATH"
 fi
 
-export DYLD_LIBRARY_PATH
-
 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"
 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:$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
+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
+
 #
 # Set a new home directory to avoid getting user options mixed in...
 #
@@ -637,7 +661,7 @@ 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
@@ -647,9 +671,9 @@ if test `uname` = Darwin -a "x$VALGRIND" = x; then
                 insert="/usr/lib/libgmalloc.dylib:$DYLD_INSERT_LIBRARIES"
         fi
 
-       DYLD_INSERT_LIBRARIES="$insert" MallocStackLogging=1 ../scheduler/cupsd -c $BASE/cupsd.conf -f >$BASE/log/debug_log 2>&1 &
+       DYLD_INSERT_LIBRARIES="$insert" MallocStackLogging=1 $runcups ../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 &
+       $runcups $VALGRIND ../scheduler/cupsd -c $BASE/cupsd.conf -f >$BASE/log/debug_log 2>&1 &
 fi
 
 cupsd=$!
@@ -659,33 +683,6 @@ if test "x$testtype" = x0; then
        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
@@ -701,10 +698,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
@@ -741,6 +736,7 @@ 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"
@@ -749,7 +745,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
@@ -778,7 +774,7 @@ 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=$?
@@ -805,20 +801,20 @@ fi
 
 echo $ac_n "Performing restart test: $ac_c"
 echo "" >>$strfile
-echo "\"5.10-restart\":" >>$strfile
+echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"5.10-restart\":" >>$strfile
 
 kill -HUP $cupsd
 
 while true; do
        sleep 10
 
-       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
 done
 
-description="`../systemv/lpstat -l -p Test1 | grep Description | sed -e '1,$s/^[^:]*: //g'`"
+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')"

diff --git a/test/waitjobs.sh b/test/waitjobs.sh
index a54f560fdb5579db46944499777fbe454cfc8647..6e20e3caf1e3aba67129dd34e10cfadb52f66da7 100755 (executable)
--- a/test/waitjobs.sh
+++ b/test/waitjobs.sh
@@ -34,7 +34,7 @@ echo $ac_n "Waiting for jobs to complete...$ac_c"
 oldjobs=0
 
 while test $timeout -gt 0; do
-       jobs=`../systemv/lpstat 2>/dev/null | wc -l | tr -d ' '`
+       jobs=`$runcups ../systemv/lpstat 2>/dev/null | wc -l | tr -d ' '`
        if test $jobs = 0; then
                break
        fi