Update more IPP strings.

[thirdparty/cups.git] / test / 5.1-lpadmin.sh

diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
index d73b992934043bf84941642ed6c48904ca1708a9..7efc398924e16d8f844625b59f9215c743b09246 100644 (file)
--- a/test/5.1-lpadmin.sh
+++ b/test/5.1-lpadmin.sh
@@ -1,44 +1,35 @@
 #!/bin/sh
 #
-# "$Id: 5.1-lpadmin.sh 4494 2005-02-18 02:18:11Z mike $"
+# Test the lpadmin command.
 #
-#   Test the lpadmin command.
+# Copyright © 2007-2018 by Apple Inc.
+# Copyright © 1997-2005 by Easy Software Products, all rights reserved.
 #
-#   Copyright 1997-2005 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 "Add Printer Test"
 echo ""
-echo "    lpadmin -p Test3 -v file:/dev/null -E -m deskjet.ppd"
-../systemv/lpadmin -p Test3 -v file:/dev/null -E -m deskjet.ppd 2>&1
+echo "    lpadmin -p Test3 -v file:/dev/null -E -m drv:///sample.drv/deskjet.ppd"
+$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
 else
-       echo "    PASSED"
+       if test -f $CUPS_SERVERROOT/ppd/Test3.ppd; then
+               echo "    PASSED"
+       else
+               echo "    FAILED (No PPD)"
+               exit 1
+       fi
 fi
 echo ""
 
 echo "Modify Printer Test"
 echo ""
 echo "    lpadmin -p Test3 -v file:/tmp/Test3 -o PageSize=A4"
-../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
@@ -50,7 +41,7 @@ echo ""
 echo "Delete Printer Test"
 echo ""
 echo "    lpadmin -x Test3"
-../systemv/lpadmin -x Test3 2>&1
+$runcups $VALGRIND ../systemv/lpadmin -x Test3 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1
@@ -59,6 +50,14 @@ else
 fi
 echo ""
 
-#
-# End of "$Id: 5.1-lpadmin.sh 4494 2005-02-18 02:18:11Z mike $".
-#
+echo "Add Shared Printer Test"
+echo ""
+echo "    lpadmin -p Test3 -E -v ipp://localhost:$IPP_PORT/printers/Test2 -m everywhere"
+$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
+else
+       echo "    PASSED"
+fi
+echo ""