Update test suite for new location of test files.

diff --git a/Makefile b/Makefile
index ae6cf37746c48f619913602d9ca75dab82c8efa8..30dfa60169c57be721454f5e3dd45a034194f33a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,13 @@ include Makedefs
 DIRS   =       cups $(BUILDDIRS)
 
 
+#
+# Test suite options - normally blank, override with make command...
+#
+
+TESTOPTIONS    =
+
+
 #
 # Make all targets...
 #
@@ -246,7 +253,7 @@ uninstall:
 
 test:  all unittests
        echo Running CUPS test suite...
-       cd test; ./run-stp-tests.sh
+       cd test; ./run-stp-tests.sh $(TESTOPTIONS)
 
 
 check: all unittests

diff --git a/test/4.1-requests.test b/test/4.1-requests.test
index 8ff798f918924ec86067662abeade112659527a2..e6550545c3fa9dc51ba006fcbeb822d5d7777551 100644 (file)
--- a/test/4.1-requests.test
+++ b/test/4.1-requests.test
@@ -5,7 +5,7 @@
 #   attributes-natural-language
 #   printer-uri/job-uri
 #
-# Copyright © 2007-2013 by Apple Inc.
+# Copyright © 2007-2019 by Apple Inc.
 # Copyright © 2001-2006 by Easy Software Products. All rights reserved.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more

diff --git a/test/4.2-cups-printer-ops.test b/test/4.2-cups-printer-ops.test
index 3fa2960d41c0f1acddff36c7514a7e726055b5ac..e13fcbb98323362ecd34c77c23c9f9afa3a096e0 100644 (file)
--- a/test/4.2-cups-printer-ops.test
+++ b/test/4.2-cups-printer-ops.test
@@ -1,7 +1,7 @@
 #
 # Verify that the CUPS printer operations work.
 #
-# Copyright © 2007-2014 by Apple Inc.
+# Copyright © 2007-2019 by Apple Inc.
 # Copyright © 2001-2006 by Easy Software Products. All rights reserved.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more

diff --git a/test/4.3-job-ops.test b/test/4.3-job-ops.test
index 37a5e104190699ca8a95b2bc9aea4eaee99cce85..f92801f3327b8da0ae15673e18ee10bff3c771c0 100644 (file)
--- a/test/4.3-job-ops.test
+++ b/test/4.3-job-ops.test
@@ -1,7 +1,7 @@
 #
 # Verify that the IPP job operations work.
 #
-# Copyright © 2007-2013 by Apple Inc.
+# Copyright © 2007-2019 by Apple Inc.
 # Copyright © 2001-2006 by Easy Software Products. All rights reserved.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more
@@ -23,7 +23,7 @@
        ATTR name requesting-user-name $user
        ATTR name job-sheets "none\,none"
 
-       FILE testfile.ps
+       FILE ../examples/testfile.ps
 
        # What statuses are OK?
        STATUS client-error-bad-request
@@ -43,7 +43,7 @@
        ATTR uri printer-uri $method://$hostname:$port/printers/Test1
        ATTR name requesting-user-name $user
 
-       FILE testfile.ps
+       FILE ../examples/testfile.ps
 
        # What statuses are OK?
        STATUS successful-ok
@@ -96,7 +96,7 @@
         GROUP subscription
        ATTR uri notify-recipient-uri testnotify:///
 
-       FILE testfile.jpg
+       FILE ../examples/testfile.jpg
 
        # What statuses are OK?
        STATUS successful-ok
@@ -147,7 +147,7 @@
        ATTR uri printer-uri $method://$hostname:$port/printers/Test1
        ATTR name requesting-user-name $user
 
-       FILE testfile.txt
+       FILE ../examples/testfile.txt
 
        # What statuses are OK?
        STATUS successful-ok
@@ -175,7 +175,7 @@
        GROUP job
        ATTR keyword job-hold-until weekend
 
-       FILE testfile.pdf
+       FILE ../examples/testfile.pdf
 
        # What statuses are OK?
        STATUS successful-ok
@@ -248,7 +248,7 @@
        GROUP job
        ATTR keyword job-hold-until indefinite
 
-       FILE testfile.jpg
+       FILE ../examples/testfile.jpg
 
        # What statuses are OK?
        STATUS successful-ok

diff --git a/test/4.4-subscription-ops.test b/test/4.4-subscription-ops.test
index 80c8884240595d2e26e35ae1b21f4e1226094cc7..45c3ce12b91fb515159c452b96d39ecc0101e036 100644 (file)
--- a/test/4.4-subscription-ops.test
+++ b/test/4.4-subscription-ops.test
@@ -1,7 +1,7 @@
 #
 # Verify that the CUPS subscription operations work.
 #
-# Copyright © 2007-2013 by Apple Inc.
+# Copyright © 2007-2019 by Apple Inc.
 # Copyright © 2001-2006 by Easy Software Products. All rights reserved.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more

diff --git a/test/5.4-lpstat.sh b/test/5.4-lpstat.sh
index ba5246dfc68fe505694e1d1dd7c4b7f8b3d9215e..b8918c833b2a3731638002679d82bc5306e9d2bb 100644 (file)
--- a/test/5.4-lpstat.sh
+++ b/test/5.4-lpstat.sh
@@ -2,7 +2,7 @@
 #
 # Test the lpstat command.
 #
-# Copyright © 2007-2017 by Apple Inc.
+# Copyright © 2007-2019 by Apple Inc.
 # Copyright © 1997-2005 by Easy Software Products, all rights reserved.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more

diff --git a/test/5.5-lp.sh b/test/5.5-lp.sh
index ba7c5f91bf868efd603852d753c9fe775f14239a..03adc5ffd79a86becc6aa1bb6b9e890020ba3ea7 100644 (file)
--- a/test/5.5-lp.sh
+++ b/test/5.5-lp.sh
@@ -2,7 +2,7 @@
 #
 # Test the lp command.
 #
-# Copyright © 2007-2014 by Apple Inc.
+# Copyright © 2007-2019 by Apple Inc.
 # Copyright © 1997-2005 by Easy Software Products, all rights reserved.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more
@@ -12,7 +12,7 @@
 echo "LP Default Test"
 echo ""
 echo "    lp testfile.pdf"
-$runcups $VALGRIND ../systemv/lp testfile.pdf 2>&1
+$runcups $VALGRIND ../systemv/lp ../examples/testfile.pdf 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1
@@ -24,7 +24,7 @@ echo ""
 echo "LP Destination Test"
 echo ""
 echo "    lp -d Test3 -o fit-to-page testfile.jpg"
-$runcups $VALGRIND ../systemv/lp -d Test3 -o fit-to-page testfile.jpg 2>&1
+$runcups $VALGRIND ../systemv/lp -d Test3 -o fit-to-page ../examples/testfile.jpg 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1
@@ -36,7 +36,7 @@ echo ""
 echo "LP Options Test"
 echo ""
 echo "    lp -d Test1 -P 1-4 -o job-sheets=classified,classified testfile.pdf"
-$runcups $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 ../examples/testfile.pdf 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1
@@ -54,13 +54,13 @@ pids=""
 while test $i -lt $1; do
        j=1
        while test $j -le $2; do
-               $runcups $VALGRIND ../systemv/lp -d test-$j testfile.jpg 2>&1
+               $runcups $VALGRIND ../systemv/lp -d test-$j ../examples/testfile.jpg 2>&1
                j=`expr $j + 1`
        done
 
-       $runcups $VALGRIND ../systemv/lp -d Test1 testfile.jpg 2>&1 &
+       $runcups $VALGRIND ../systemv/lp -d Test1 ../examples/testfile.jpg 2>&1 &
        pids="$pids $!"
-       $runcups $VALGRIND ../systemv/lp -d Test2 testfile.jpg 2>&1 &
+       $runcups $VALGRIND ../systemv/lp -d Test2 ../examples/testfile.jpg 2>&1 &
        pids="$pids $!"
 
        i=`expr $i + 1`

diff --git a/test/5.6-lpr.sh b/test/5.6-lpr.sh
index 1a1908349ee2e6c6175c76bbcd709c075b2f1e8f..98c8d696394969a51820c6f581e8ed3a7d1fc4ac 100644 (file)
--- a/test/5.6-lpr.sh
+++ b/test/5.6-lpr.sh
@@ -2,7 +2,7 @@
 #
 # Test the lpr command.
 #
-# Copyright © 2007-2014 by Apple Inc.
+# Copyright © 2007-2019 by Apple Inc.
 # Copyright © 1997-2005 by Easy Software Products, all rights reserved.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more
@@ -12,7 +12,7 @@
 echo "LPR Default Test"
 echo ""
 echo "    lpr testfile.pdf"
-$runcups $VALGRIND ../berkeley/lpr testfile.pdf 2>&1
+$runcups $VALGRIND ../berkeley/lpr ../examples/testfile.pdf 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1
@@ -24,7 +24,7 @@ echo ""
 echo "LPR Destination Test"
 echo ""
 echo "    lpr -P Test3 -o fit-to-page testfile.jpg"
-$runcups $VALGRIND ../berkeley/lpr -P Test3 -o fit-to-page testfile.jpg 2>&1
+$runcups $VALGRIND ../berkeley/lpr -P Test3 -o fit-to-page ../examples/testfile.jpg 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1
@@ -36,7 +36,7 @@ echo ""
 echo "LPR Options Test"
 echo ""
 echo "    lpr -P Test1 -o number-up=4 -o job-sheets=standard,none testfile.pdf"
-$runcups $VALGRIND ../berkeley/lpr -P Test1 -o number-up=4 -o job-sheets=standard,none testfile.pdf 2>&1
+$runcups $VALGRIND ../berkeley/lpr -P Test1 -o number-up=4 -o job-sheets=standard,none ../examples/testfile.pdf 2>&1
 if test $? != 0; then
        echo "    FAILED"
        exit 1
@@ -54,13 +54,13 @@ pids=""
 while test $i -lt $1; do
        j=1
        while test $j -le $2; do
-               $runcups $VALGRIND ../berkeley/lpr -P test-$j testfile.jpg 2>&1
+               $runcups $VALGRIND ../berkeley/lpr -P test-$j ../examples/testfile.jpg 2>&1
                j=`expr $j + 1`
        done
 
-       $runcups $VALGRIND ../berkeley/lpr -P Test1 testfile.jpg 2>&1 &
+       $runcups $VALGRIND ../berkeley/lpr -P Test1 ../examples/testfile.jpg 2>&1 &
        pids="$pids $!"
-       $runcups $VALGRIND ../berkeley/lpr -P Test2 testfile.jpg 2>&1 &
+       $runcups $VALGRIND ../berkeley/lpr -P Test2 ../examples/testfile.jpg 2>&1 &
        pids="$pids $!"
 
        i=`expr $i + 1`

diff --git a/test/5.7-lprm.sh b/test/5.7-lprm.sh
index 29251f943af2a5a677043ee67130837eaa279b57..8958deaa59c7738e19afb681323a916f69bfa855 100644 (file)
--- a/test/5.7-lprm.sh
+++ b/test/5.7-lprm.sh
@@ -2,7 +2,7 @@
 #
 # Test the lprm command.
 #
-# Copyright © 2007-2011 by Apple Inc.
+# Copyright © 2007-2019 by Apple Inc.
 # Copyright © 1997-2005 by Easy Software Products, all rights reserved.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more
@@ -12,7 +12,7 @@
 echo "LPRM Current Test"
 echo ""
 echo "    lpr -o job-hold-until=indefinite testfile.jpg"
-$runcups $VALGRIND ../berkeley/lpr -o job-hold-until=indefinite testfile.jpg 2>&1
+$runcups $VALGRIND ../berkeley/lpr -o job-hold-until=indefinite ../examples/testfile.jpg 2>&1
 echo "    lprm"
 $runcups $VALGRIND ../berkeley/lprm 2>&1
 if test $? != 0; then
@@ -26,7 +26,7 @@ echo ""
 echo "LPRM Destination Test"
 echo ""
 echo "    lpr -P Test1 -o job-hold-until=indefinite testfile.jpg"
-$runcups $VALGRIND ../berkeley/lpr -P Test1 -o job-hold-until=indefinite testfile.jpg 2>&1
+$runcups $VALGRIND ../berkeley/lpr -P Test1 -o job-hold-until=indefinite ../examples/testfile.jpg 2>&1
 echo "    lprm Test1"
 $runcups $VALGRIND ../berkeley/lprm Test1 2>&1
 if test $? != 0; then

diff --git a/test/5.8-cancel.sh b/test/5.8-cancel.sh
index bd7cf5fbbdf7a7806bc7fd34c07edf87e3829264..43041971222656d8ca403eb94b4e2bf0435d5ace 100644 (file)
--- a/test/5.8-cancel.sh
+++ b/test/5.8-cancel.sh
@@ -2,7 +2,7 @@
 #
 # Test the cancel command.
 #
-# Copyright © 2007-2013 by Apple Inc.
+# Copyright © 2007-2019 by Apple Inc.
 # Copyright © 1997-2006 by Easy Software Products, all rights reserved.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more
@@ -12,7 +12,7 @@
 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 testfile.jpg 2>&1
+$runcups $VALGRIND ../systemv/lp -d Test1 -o job-hold-until=indefinite ../examples/testfile.jpg 2>&1
 echo "    cancel Test1"
 $runcups $VALGRIND ../systemv/cancel Test1 2>&1
 if test $? != 0; then

diff --git a/test/5.9-lpinfo.sh b/test/5.9-lpinfo.sh
index 7d67fe3e06503bc41815cce6cad6164d52589718..5c76f220c3dcd922c8ab96f44168ad94b9f437b8 100644 (file)
--- a/test/5.9-lpinfo.sh
+++ b/test/5.9-lpinfo.sh
@@ -2,7 +2,7 @@
 #
 # Test the lpinfo command.
 #
-# Copyright © 2007-2011 by Apple Inc.
+# Copyright © 2007-2019 by Apple Inc.
 # Copyright © 1997-2005 by Easy Software Products, all rights reserved.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index a4d642daec2e17ca9aded215f004749d3d1822d2..64322d68ce44bcf60800925166d45f3b1b05e522 100755 (executable)
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -737,19 +737,19 @@ echo "    $date by $user on `hostname`." >>$strfile
 echo "    <pre>" >>$strfile
 
 fail=0
-for file in 4*.test ipp-2.1.test; do
-       echo $ac_n "Performing $file: $ac_c"
+for file in 4*.test ../examples/ipp-2.1.test; do
+       echo $ac_n "Performing `basename $file`: $ac_c"
        echo "" >>$strfile
         echo $ac_n "`date '+[%d/%b/%Y:%H:%M:%S %z]'` $ac_c" >>$strfile
 
-       if test $file = ipp-2.1.test; then
+       if test $file = ../examples/ipp-2.1.test; then
                uri="ipp://localhost:$port/printers/Test1"
                options="-V 2.1 -d NOPRINT=1 -f testfile.ps"
        else
                uri="ipp://localhost:$port/printers"
                options=""
        fi
-       $runcups $VALGRIND ./ipptool -tI $options $uri $file >> $strfile
+       $runcups $VALGRIND ../tools/ipptool -tI $options $uri $file >> $strfile
        status=$?
 
        if test $status != 0; then
@@ -831,7 +831,7 @@ echo "`date '+[%d/%b/%Y:%H:%M:%S %z]'` \"5.11-history\":" >>$strfile
 
 echo "    lp -d Test1 testfile.jpg" >>$strfile
 
-$runcups ../systemv/lp -d Test1 testfile.jpg 2>&1 >>$strfile
+$runcups ../systemv/lp -d Test1 ../examples/testfile.jpg 2>&1 >>$strfile
 if test $? != 0; then
        echo "FAIL (unable to queue test job)"
        echo "    FAILED" >>$strfile

diff --git a/test/waitjobs.sh b/test/waitjobs.sh
index 6e20e3caf1e3aba67129dd34e10cfadb52f66da7..79c1ab0570c8d53614a572c019b26eb1e1e530db 100755 (executable)
--- a/test/waitjobs.sh
+++ b/test/waitjobs.sh
@@ -2,7 +2,7 @@
 #
 # Script to wait for jobs to complete.
 #
-# Copyright © 2008-2009 by Apple Inc.
+# Copyright © 2008-2019 by Apple Inc.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more
 # information.