Update test suite for new location of test files.

[thirdparty/cups.git] / test / 5.8-cancel.sh

diff --git a/test/5.8-cancel.sh b/test/5.8-cancel.sh
index 926bc9eb635f742c107de0c18c0bbb1e5d4dd60a..43041971222656d8ca403eb94b4e2bf0435d5ace 100644 (file)
--- a/test/5.8-cancel.sh
+++ b/test/5.8-cancel.sh
@@ -1,32 +1,20 @@
 #!/bin/sh
 #
-# "$Id: 5.8-cancel.sh 5091 2006-02-08 18:39:56Z mike $"
+# Test the cancel command.
 #
-#   Test the cancel command.
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 1997-2006 by Easy Software Products, all rights reserved.
 #
-#   Copyright 1997-2006 by Easy Software Products, all rights reserved.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products 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 missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
 #
 
 echo "Cancel Destination Test"
 echo ""
+echo "    lp -d Test1 -o job-hold-until=indefinite testfile.jpg"
+$runcups $VALGRIND ../systemv/lp -d Test1 -o job-hold-until=indefinite ../examples/testfile.jpg 2>&1
 echo "    cancel Test1"
-../systemv/cancel Test1 2>&1
+$runcups $VALGRIND ../systemv/cancel Test1 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1
@@ -38,7 +26,7 @@ echo ""
 echo "Cancel All Test"
 echo ""
 echo "    cancel -a"
-../systemv/cancel -a 2>&1
+$runcups $VALGRIND ../systemv/cancel -a 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1
@@ -47,6 +35,14 @@ else
 fi
 echo ""
 
-#
-# End of "$Id: 5.8-cancel.sh 5091 2006-02-08 18:39:56Z mike $".
-#
+echo "Purge All Test"
+echo ""
+echo "    cancel -a -x"
+$runcups $VALGRIND ../systemv/cancel -a -x 2>&1
+if test $? != 0; then
+       echo "    FAILED"
+       exit 1
+else
+       echo "    PASSED"
+fi
+echo ""