Changelog.

[thirdparty/cups.git] / test / 5.4-lpstat.sh

diff --git a/test/5.4-lpstat.sh b/test/5.4-lpstat.sh
index b2e38f12e97b4d590575fbe02f82823e6c8992d7..b8918c833b2a3731638002679d82bc5306e9d2bb 100644 (file)
--- a/test/5.4-lpstat.sh
+++ b/test/5.4-lpstat.sh
@@ -1,23 +1,18 @@
 #!/bin/sh
 #
-# "$Id: 5.4-lpstat.sh 6649 2007-07-11 21:46:42Z mike $"
+# Test the lpstat command.
 #
-#   Test the lpstat command.
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 1997-2005 by Easy Software Products, all rights reserved.
 #
-#   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
-#   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 "LPSTAT Test"
+echo "LPSTAT Basic Test"
 echo ""
 echo "    lpstat -t"
-$VALGRIND ../systemv/lpstat -t 2>&1
+$runcups $VALGRIND ../systemv/lpstat -t 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1
@@ -26,18 +21,29 @@ else
 fi
 echo ""
 
-echo "LPSTAT Test"
+echo "LPSTAT Enumeration Test"
+echo ""
+echo "    lpstat -e"
+printers="`$runcups $VALGRIND ../systemv/lpstat -e 2>&1`"
+if test $? != 0 -o "x$printers" = x; then
+       echo "    FAILED"
+       exit 1
+else
+       for printer in $printers; do
+               echo $printer
+       done
+       echo "    PASSED"
+fi
+echo ""
+
+echo "LPSTAT Get Host Test"
 echo ""
 echo "    lpstat -H"
-server="`$VALGRIND ../systemv/lpstat -H 2>&1`"
-if test $? != 0 -o "x$server" != xlocalhost:8631; then
+server="`$runcups $VALGRIND ../systemv/lpstat -H 2>&1`"
+if test $? != 0 -o "x$server" != x$CUPS_SERVER; then
        echo "    FAILED ($server)"
        exit 1
 else
        echo "    PASSED ($server)"
 fi
 echo ""
-
-#
-# End of "$Id: 5.4-lpstat.sh 6649 2007-07-11 21:46:42Z mike $".
-#