From: Michael Sweet <michael.r.sweet@gmail.com>
Date: Fri, 16 Jun 2017 21:39:13 +0000 (-0400)
Subject: Fix "make check" failure (Issue #5033)
X-Git-Tag: v2.2.4~32
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fcups.git;a=commitdiff_plain;h=d2f1a784c46310f86c34434e9bf447f060bf0ec2

Fix "make check" failure (Issue #5033)
---

diff --git a/scheduler/printers.c b/scheduler/printers.c
index 1c81c5504..dca09626a 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -4999,31 +4999,6 @@ load_ppd(cupsd_printer_t *p)		/* I - Printer */
 
       p->type |= CUPS_PRINTER_REMOTE;
 
-     /*
-      * Point the printer-uri-supported attribute to the
-      * remote printer...
-      */
-
-      if (strchr(p->device_uri, '?'))
-      {
-       /*
-	* Strip trailing "?options" from URI...
-	*/
-
-	char	resource[HTTP_MAX_URI],	/* New URI */
-		*ptr;			/* Pointer into URI */
-
-	strlcpy(resource, p->device_uri, sizeof(resource));
-	if ((ptr = strchr(resource, '?')) != NULL)
-	  *ptr = '\0';
-
-	ippAddString(p->attrs, IPP_TAG_PRINTER, IPP_TAG_URI,
-		     "printer-uri-supported", NULL, resource);
-      }
-      else
-	ippAddString(p->attrs, IPP_TAG_PRINTER, IPP_TAG_URI,
-		     "printer-uri-supported", NULL, p->device_uri);
-
      /*
       * Then set the make-and-model accordingly...
       */
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 54ed7fbf4..792f10d70 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1105,29 +1105,23 @@ done
 cat str-trailer.html >>$strfile
 
 echo ""
+for file in $BASE/log/*_log; do
+        baselog=`basename $file`
+        cp $file $baselog-$date-$user
+        echo "Copied log file \"$baselog-$date-$user\" to test directory."
+done
+cp $strfile .
+echo "Copied report file \"cups-str-$date-$user.html\" to test directory."
 
-if test $fail != 0; then
-	echo "$fail tests failed."
-
-        for file in $BASE/log/*_log; do
-                baselog=`basename $file`
-                cp $file $baselog-$date-$user
-                echo "Copied log file \"$baselog-$date-$user\" to test directory."
-        done
-	cp $strfile .
-        echo "Copied report file \"cups-str-$date-$user.html\" to test directory."
+# Clean out old failure log files after 1 week...
+find . -name \*_log-\*-$user -a -mtime +1w -print -exec rm -f '{}' \; | awk '{print "Removed old log file \"" substr($1,3) "\" from test directory."}'
+find . -name cups-str-\*-$user.html -a -mtime +1w -print -exec rm -f '{}' \; | awk '{print "Removed old report file \"" $1 "\" from test directory."}'
 
-        # Clean out old failure log files after 1 week...
-        find . -name \*_log-\*-$user -a -mtime +1w -print -exec rm -f '{}' \; | awk '{print "Removed old log file \"" substr($1,3) "\" from test directory."}'
-        find . -name cups-str-\*-$user.html -a -mtime +1w -print -exec rm -f '{}' \; | awk '{print "Removed old report file \"" $1 "\" from test directory."}'
+echo ""
 
-        echo ""
+if test $fail != 0; then
+	echo "$fail tests failed."
 	exit 1
-
 else
 	echo "All tests were successful."
-	echo ""
-        echo "Log files can be found in $BASE/log."
-        echo "A HTML report was created in $strfile."
-        echo ""
 fi