Merge changes from CUPS 1.6svn-r10112.

[thirdparty/cups.git] / test / 5.5-lp.sh

diff --git a/test/5.5-lp.sh b/test/5.5-lp.sh
index 9dd1dd0015a22bb09deb3e468a16a42af11d40b8..f74e79ba91dce8b9a19ae9210e1929bda6d23c42 100644 (file)
--- a/test/5.5-lp.sh
+++ b/test/5.5-lp.sh
@@ -4,7 +4,7 @@
 #
 #   Test the lp command.
 #
-#   Copyright 2007-2009 by Apple Inc.
+#   Copyright 2007-2011 by Apple Inc.
 #   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -17,7 +17,7 @@
 echo "LP Default Test"
 echo ""
 echo "    lp testfile.pdf"
-../systemv/lp testfile.pdf 2>&1
+$VALGRIND ../systemv/lp testfile.pdf 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1
@@ -29,7 +29,7 @@ echo ""
 echo "LP Destination Test"
 echo ""
 echo "    lp -d Test2 testfile.jpg"
-../systemv/lp -d Test2 testfile.jpg 2>&1
+$VALGRIND ../systemv/lp -d Test2 testfile.jpg 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1
@@ -41,7 +41,7 @@ echo ""
 echo "LP Options Test"
 echo ""
 echo "    lp -d Test1 -P 1-4 -o job-sheets=classified,classified testfile.pdf"
-../systemv/lp -d Test1 -P 1-4 -o job-sheets=classified,classified testfile.pdf 2>&1
+$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
@@ -56,16 +56,14 @@ echo "    lp -d Test1 testfile.jpg"
 echo "    lp -d Test2 testfile.jpg"
 i=0
 while test $i -lt $1; do
-       echo "    flood copy $i..." 1>&2
-
        j=1
        while test $j -le $2; do
-               ../systemv/lp -d test-$j testfile.jpg 2>&1
+               $VALGRIND ../systemv/lp -d test-$j testfile.jpg 2>&1
                j=`expr $j + 1`
        done
 
-       ../systemv/lp -d Test1 testfile.jpg 2>&1 &
-       ../systemv/lp -d Test2 testfile.jpg 2>&1 &
+       $VALGRIND ../systemv/lp -d Test1 testfile.jpg 2>&1 &
+       $VALGRIND ../systemv/lp -d Test2 testfile.jpg 2>&1 &
        lppid=$!
 
        i=`expr $i + 1`