From: Michael R Sweet Date: Thu, 14 Sep 2023 20:42:43 +0000 (-0400) Subject: Fix "make test" and remove debug printf. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd20bc6b548ccd396841522c01929b9cc91f6ed8;p=thirdparty%2Fcups.git Fix "make test" and remove debug printf. --- diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx index a26719a9ce..b013fb4fe5 100644 --- a/scheduler/cups-driverd.cxx +++ b/scheduler/cups-driverd.cxx @@ -2522,7 +2522,6 @@ load_ppds(const char *d, // I - Actual directory line[0] = '\0'; cupsFileGets(fp, line, sizeof(line)); - fprintf(stderr, "ERROR: '%s' => '%s'\n", filename, line); if (!strncmp(line, "*PPD-Adobe:", 11)) { /* diff --git a/test/4.2-cups-printer-ops.test b/test/4.2-cups-printer-ops.test index e13fcbb983..2d8ec1aaf8 100644 --- a/test/4.2-cups-printer-ops.test +++ b/test/4.2-cups-printer-ops.test @@ -1,6 +1,7 @@ # # Verify that the CUPS printer operations work. # +# Copyright © 2023 by OpenPrinting. # Copyright © 2007-2019 by Apple Inc. # Copyright © 2001-2006 by Easy Software Products. All rights reserved. # @@ -19,7 +20,7 @@ GROUP operation ATTR charset attributes-charset utf-8 ATTR language attributes-natural-language en - ATTR uri printer-uri $method://$hostname:$port/printers/Test1 + ATTR uri printer-uri $scheme://$hostname:$port/printers/Test1 FILE testhp.ppd @@ -42,7 +43,7 @@ GROUP operation ATTR charset attributes-charset utf-8 ATTR language attributes-natural-language en - ATTR uri printer-uri $method://$hostname:$port/printers/Test1 + ATTR uri printer-uri $scheme://$hostname:$port/printers/Test1 # What statuses are OK? STATUS successful-ok @@ -63,7 +64,7 @@ GROUP operation ATTR charset attributes-charset utf-8 ATTR language attributes-natural-language en - ATTR uri printer-uri $method://$hostname:$port/printers/Test1 + ATTR uri printer-uri $scheme://$hostname:$port/printers/Test1 # What statuses are OK? STATUS successful-ok @@ -84,7 +85,7 @@ GROUP operation ATTR charset attributes-charset utf-8 ATTR language attributes-natural-language en - ATTR uri printer-uri $method://$hostname:$port/printers/Test1 + ATTR uri printer-uri $scheme://$hostname:$port/printers/Test1 # What statuses are OK? STATUS client-error-not-found @@ -105,7 +106,7 @@ GROUP operation ATTR charset attributes-charset utf-8 ATTR language attributes-natural-language en - ATTR uri printer-uri $method://$hostname:$port/ + ATTR uri printer-uri $scheme://$hostname:$port/ ATTR name requesting-user-name $user GROUP subscription @@ -132,7 +133,7 @@ GROUP operation ATTR charset attributes-charset utf-8 ATTR language attributes-natural-language en - ATTR uri printer-uri $method://$hostname:$port/printers/Test2 + ATTR uri printer-uri $scheme://$hostname:$port/printers/Test2 FILE testhp.ppd @@ -155,7 +156,7 @@ GROUP operation ATTR charset attributes-charset utf-8 ATTR language attributes-natural-language en - ATTR uri printer-uri $method://$hostname:$port/printers/Test2 + ATTR uri printer-uri $scheme://$hostname:$port/printers/Test2 # What statuses are OK? STATUS successful-ok @@ -176,7 +177,7 @@ GROUP operation ATTR charset attributes-charset utf-8 ATTR language attributes-natural-language en - ATTR uri printer-uri $method://$hostname:$port/printers/Test2 + ATTR uri printer-uri $scheme://$hostname:$port/printers/Test2 GROUP printer ATTR uri device-uri file:/tmp/Test2 @@ -202,7 +203,7 @@ GROUP operation ATTR charset attributes-charset utf-8 ATTR language attributes-natural-language en - ATTR uri printer-uri $method://$hostname:$port/printers/Test1 + ATTR uri printer-uri $scheme://$hostname:$port/printers/Test1 GROUP printer ATTR uri device-uri file:/tmp/Test1 @@ -231,7 +232,7 @@ GROUP operation ATTR charset attributes-charset utf-8 ATTR language attributes-natural-language en - ATTR uri printer-uri $method://$hostname:$port/printers/Test1 + ATTR uri printer-uri $scheme://$hostname:$port/printers/Test1 # What statuses are OK? STATUS successful-ok @@ -272,7 +273,7 @@ GROUP operation ATTR charset attributes-charset utf-8 ATTR language attributes-natural-language en - ATTR uri printer-uri $method://$hostname:$port/printers/Test1 + ATTR uri printer-uri $scheme://$hostname:$port/printers/Test1 # What statuses are OK? STATUS successful-ok @@ -318,7 +319,7 @@ GROUP operation ATTR charset attributes-charset utf-8 ATTR language attributes-natural-language en - ATTR uri printer-uri $method://$hostname:$port/printers/Test1 + ATTR uri printer-uri $scheme://$hostname:$port/printers/Test1 # What statuses are OK? STATUS successful-ok diff --git a/test/4.3-job-ops.test b/test/4.3-job-ops.test index f92801f332..c1c6d8045c 100644 --- a/test/4.3-job-ops.test +++ b/test/4.3-job-ops.test @@ -19,7 +19,7 @@ GROUP operation ATTR charset attributes-charset utf-8 ATTR language attributes-natural-language en - ATTR uri printer-uri $method://$hostname:$port/printers/Test1 + ATTR uri printer-uri $scheme://$hostname:$port/printers/Test1 ATTR name requesting-user-name $user ATTR name job-sheets "none\,none" @@ -40,7 +40,7 @@ GROUP operation ATTR charset attributes-charset utf-8 ATTR language attributes-natural-language en - ATTR uri printer-uri $method://$hostname:$port/printers/Test1 + ATTR uri printer-uri $scheme://$hostname:$port/printers/Test1 ATTR name requesting-user-name $user FILE ../examples/testfile.ps @@ -65,7 +65,7 @@ GROUP operation ATTR charset attributes-charset utf-8 ATTR language attributes-natural-language en - ATTR uri printer-uri $method://$hostname:$port/printers/Test1 + ATTR uri printer-uri $scheme://$hostname:$port/printers/Test1 ATTR integer job-id $job-id # What statuses are OK? @@ -90,7 +90,7 @@ GROUP operation ATTR charset attributes-charset utf-8 ATTR language attributes-natural-language en - ATTR uri printer-uri $method://$hostname:$port/printers/Test2 + ATTR uri printer-uri $scheme://$hostname:$port/printers/Test2 ATTR name requesting-user-name $user GROUP subscription @@ -119,7 +119,7 @@ GROUP operation ATTR charset attributes-charset utf-8 ATTR language attributes-natural-language en - ATTR uri printer-uri $method://$hostname:$port/printers/Test2 + ATTR uri printer-uri $scheme://$hostname:$port/printers/Test2 ATTR integer job-id $job-id # What statuses are OK? @@ -144,7 +144,7 @@ GROUP operation ATTR charset attributes-charset utf-8 ATTR language attributes-natural-language en - ATTR uri printer-uri $method://$hostname:$port/printers/Test1 + ATTR uri printer-uri $scheme://$hostname:$port/printers/Test1 ATTR name requesting-user-name $user FILE ../examples/testfile.txt @@ -169,7 +169,7 @@ GROUP operation ATTR charset attributes-charset utf-8 ATTR language attributes-natural-language en - ATTR uri printer-uri $method://$hostname:$port/printers/Test1 + ATTR uri printer-uri $scheme://$hostname:$port/printers/Test1 ATTR name requesting-user-name $user GROUP job @@ -197,7 +197,7 @@ GROUP operation ATTR charset attributes-charset utf-8 ATTR language attributes-natural-language en - ATTR uri printer-uri $method://$hostname:$port/printers/Test1 + ATTR uri printer-uri $scheme://$hostname:$port/printers/Test1 ATTR integer job-id $job-id ATTR name requesting-user-name $user @@ -220,7 +220,7 @@ GROUP operation ATTR charset attributes-charset utf-8 ATTR language attributes-natural-language en - ATTR uri printer-uri $method://$hostname:$port/printers/Test1 + ATTR uri printer-uri $scheme://$hostname:$port/printers/Test1 ATTR integer job-id $job-id ATTR name requesting-user-name $user @@ -243,7 +243,7 @@ GROUP operation ATTR charset attributes-charset utf-8 ATTR language attributes-natural-language en - ATTR uri printer-uri $method://$hostname:$port/printers/Test1 + ATTR uri printer-uri $scheme://$hostname:$port/printers/Test1 ATTR name requesting-user-name $user GROUP job ATTR keyword job-hold-until indefinite @@ -270,7 +270,7 @@ GROUP operation ATTR charset attributes-charset utf-8 ATTR language attributes-natural-language en - ATTR uri job-uri $method://$hostname:$port/jobs/$job-id + ATTR uri job-uri $scheme://$hostname:$port/jobs/$job-id ATTR name requesting-user-name $user # What statuses are OK? @@ -292,7 +292,7 @@ GROUP operation ATTR charset attributes-charset utf-8 ATTR language attributes-natural-language en - ATTR uri printer-uri $method://$hostname:$port/printers/Test1 + ATTR uri printer-uri $scheme://$hostname:$port/printers/Test1 # What statuses are OK? STATUS successful-ok