Merge changes from CUPS 1.4svn-r7394.

[thirdparty/cups.git] / test / 5.6-lpr.sh

diff --git a/test/5.6-lpr.sh b/test/5.6-lpr.sh
index 1de750fac6fffa785047b3172596e0d479caebb5..a1fe01d35e5a269993f03c2280861d212414e39d 100644 (file)
--- a/test/5.6-lpr.sh
+++ b/test/5.6-lpr.sh
@@ -4,7 +4,7 @@
 #
 #   Test the lpr command.
 #
-#   Copyright 2007 by Apple Inc.
+#   Copyright 2007-2008 by Apple Inc.
 #   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -16,8 +16,8 @@
 
 echo "LPR Default Test"
 echo ""
-echo "    lpr testfile.jpg"
-../berkeley/lpr testfile.jpg 2>&1
+echo "    lpr testfile.pdf"
+../berkeley/lpr testfile.pdf 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1
@@ -28,8 +28,20 @@ echo ""
 
 echo "LPR Destination Test"
 echo ""
-echo "    lpr -P Test1 testfile.jpg"
-../berkeley/lpr -P Test1 testfile.jpg 2>&1
+echo "    lpr -P Test2 testfile.jpg"
+../berkeley/lpr -P Test2 testfile.jpg 2>&1
+if test $? != 0; then
+       echo "    FAILED"
+       exit 1
+else
+       echo "    PASSED"
+fi
+echo ""
+
+echo "LPR Options Test"
+echo ""
+echo "    lpr -P Test1 -o number-up=4 -o job-sheets=standard,none testfile.pdf"
+../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
@@ -38,13 +50,15 @@ else
 fi
 echo ""
 
-echo "LPR Flood Test"
+echo "LPR Flood Test ($1 times in parallel)"
 echo ""
-echo "    lpr -P Test1 testfile.jpg ($1 times in parallel)"
+echo "    lpr -P Test1 testfile.jpg"
+echo "    lpr -P Test2 testfile.jpg"
 i=0
 while test $i -lt $1; do
        echo "    flood copy $i..." 1>&2
        ../berkeley/lpr -P Test1 testfile.jpg 2>&1 &
+       ../berkeley/lpr -P Test2 testfile.jpg 2>&1 &
        lprpid=$!
        i=`expr $i + 1`
 done
@@ -57,6 +71,8 @@ else
 fi
 echo ""
 
+./waitjobs.sh
+
 #
 # End of "$Id: 5.6-lpr.sh 6649 2007-07-11 21:46:42Z mike $".
 #