Cleanup to use copy_hex_string, and fix a bug in that function.

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

diff --git a/test/5.5-lp.sh b/test/5.5-lp.sh
index a74f19bf739a6f8163e8ac80beee0a882f56bc91..ba7c5f91bf868efd603852d753c9fe775f14239a 100644 (file)
--- a/test/5.5-lp.sh
+++ b/test/5.5-lp.sh
@@ -1,23 +1,18 @@
 #!/bin/sh
 #
-# "$Id$"
+# Test the lp command.
 #
-#   Test the lp command.
+# Copyright © 2007-2014 by Apple Inc.
+# Copyright © 1997-2005 by Easy Software Products, all rights reserved.
 #
-#   Copyright 2007-2014 by Apple Inc.
-#   Copyright 1997-2005 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.
 #
 
 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
@@ -29,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
@@ -41,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
@@ -59,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`
@@ -81,6 +76,14 @@ echo ""
 
 ./waitjobs.sh
 
-#
-# End of "$Id$".
-#
+echo "LPSTAT Completed Jobs Order Test"
+echo ""
+echo "    lpstat -W completed -o"
+$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
+else
+       echo "    PASSED"
+fi
+echo ""