From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Wed, 6 Nov 2013 20:11:11 +0000 (+0000)
Subject: Fix "make check" on Linux (<rdar://problem/14292998>)
X-Git-Tag: v2.2b1~817
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79a784c4d657ae70bb3d8f2f5b884fbdaeb2a8d4;p=thirdparty%2Fcups.git

Fix "make check" on Linux (<rdar://problem/14292998>)


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11398 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/test/4.1-requests.test b/test/4.1-requests.test
index fbd2a97f50..097d0fcd84 100644
--- a/test/4.1-requests.test
+++ b/test/4.1-requests.test
@@ -1,5 +1,5 @@
 #
-# "$Id: 4.1-requests.test 8144 2008-11-19 19:23:12Z mike $"
+# "$Id$"
 #
 #   Verify that the server requires the following attributes:
 #
@@ -155,5 +155,5 @@
 	STATUS server-error-version-not-supported
 }
 #
-# End of "$Id: 4.1-requests.test 8144 2008-11-19 19:23:12Z mike $"
+# End of "$Id$"
 #
diff --git a/test/4.2-cups-printer-ops.test b/test/4.2-cups-printer-ops.test
index 67c515dfe9..022335758c 100644
--- a/test/4.2-cups-printer-ops.test
+++ b/test/4.2-cups-printer-ops.test
@@ -1,5 +1,5 @@
 #
-# "$Id: 4.2-cups-printer-ops.test 6379 2007-03-21 14:57:22Z mike $"
+# "$Id$"
 #
 #   Verify that the CUPS printer operations work.
 #
@@ -323,5 +323,5 @@
 }
 
 #
-# End of "$Id: 4.2-cups-printer-ops.test 6379 2007-03-21 14:57:22Z mike $"
+# End of "$Id$"
 #
diff --git a/test/4.3-job-ops.test b/test/4.3-job-ops.test
index 2f2236b0cc..1e372ccbc8 100644
--- a/test/4.3-job-ops.test
+++ b/test/4.3-job-ops.test
@@ -1,5 +1,5 @@
 #
-# "$Id: 4.3-job-ops.test 7550 2008-05-12 16:40:40Z mike $"
+# "$Id$"
 #
 #   Verify that the IPP job operations work.
 #
@@ -326,5 +326,5 @@
 }
 
 #
-# End of "$Id: 4.3-job-ops.test 7550 2008-05-12 16:40:40Z mike $"
+# End of "$Id$"
 #
diff --git a/test/4.4-subscription-ops.test b/test/4.4-subscription-ops.test
index f6cf820f1a..57a767ac5e 100644
--- a/test/4.4-subscription-ops.test
+++ b/test/4.4-subscription-ops.test
@@ -1,5 +1,5 @@
 #
-# "$Id: 4.4-subscription-ops.test 6635 2007-07-09 20:34:48Z mike $"
+# "$Id$"
 #
 #   Verify that the CUPS subscription operations work.
 #
@@ -149,5 +149,5 @@
 }
 
 #
-# End of "$Id: 4.4-subscription-ops.test 6635 2007-07-09 20:34:48Z mike $"
+# End of "$Id$"
 #
diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
index 09af2f4f99..8ec5efe74c 100644
--- a/test/5.1-lpadmin.sh
+++ b/test/5.1-lpadmin.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: 5.1-lpadmin.sh 7494 2008-04-25 18:36:46Z mike $"
+# "$Id$"
 #
 # Test the lpadmin command.
 #
@@ -68,5 +68,5 @@ fi
 echo ""
 
 #
-# End of "$Id: 5.1-lpadmin.sh 7494 2008-04-25 18:36:46Z mike $".
+# End of "$Id$".
 #
diff --git a/test/5.2-lpc.sh b/test/5.2-lpc.sh
index ff15a87151..f1957a8b2a 100644
--- a/test/5.2-lpc.sh
+++ b/test/5.2-lpc.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: 5.2-lpc.sh 6649 2007-07-11 21:46:42Z mike $"
+# "$Id$"
 #
 #   Test the lpc command.
 #
@@ -27,5 +27,5 @@ fi
 echo ""
 
 #
-# End of "$Id: 5.2-lpc.sh 6649 2007-07-11 21:46:42Z mike $".
+# End of "$Id$".
 #
diff --git a/test/5.3-lpq.sh b/test/5.3-lpq.sh
index 633508c5a7..03087d2ccf 100644
--- a/test/5.3-lpq.sh
+++ b/test/5.3-lpq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: 5.3-lpq.sh 6649 2007-07-11 21:46:42Z mike $"
+# "$Id$"
 #
 #   Test the lpq command.
 #
@@ -27,5 +27,5 @@ fi
 echo ""
 
 #
-# End of "$Id: 5.3-lpq.sh 6649 2007-07-11 21:46:42Z mike $".
+# End of "$Id$".
 #
diff --git a/test/5.4-lpstat.sh b/test/5.4-lpstat.sh
index b2e38f12e9..c69003e42c 100644
--- a/test/5.4-lpstat.sh
+++ b/test/5.4-lpstat.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: 5.4-lpstat.sh 6649 2007-07-11 21:46:42Z mike $"
+# "$Id$"
 #
 #   Test the lpstat command.
 #
@@ -39,5 +39,5 @@ fi
 echo ""
 
 #
-# End of "$Id: 5.4-lpstat.sh 6649 2007-07-11 21:46:42Z mike $".
+# End of "$Id$".
 #
diff --git a/test/5.5-lp.sh b/test/5.5-lp.sh
index aa326a8fcb..949f3d7708 100644
--- a/test/5.5-lp.sh
+++ b/test/5.5-lp.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: 5.5-lp.sh 7415 2008-03-31 22:33:20Z mike $"
+# "$Id$"
 #
 #   Test the lp command.
 #
@@ -80,5 +80,5 @@ echo ""
 ./waitjobs.sh
 
 #
-# End of "$Id: 5.5-lp.sh 7415 2008-03-31 22:33:20Z mike $".
+# End of "$Id$".
 #
diff --git a/test/5.6-lpr.sh b/test/5.6-lpr.sh
index 9a26e75cb7..5d0663af3d 100644
--- a/test/5.6-lpr.sh
+++ b/test/5.6-lpr.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: 5.6-lpr.sh 7409 2008-03-29 00:26:03Z mike $"
+# "$Id$"
 #
 #   Test the lpr command.
 #
@@ -80,5 +80,5 @@ echo ""
 ./waitjobs.sh
 
 #
-# End of "$Id: 5.6-lpr.sh 7409 2008-03-29 00:26:03Z mike $".
+# End of "$Id$".
 #
diff --git a/test/5.7-lprm.sh b/test/5.7-lprm.sh
index 4b96920bb2..482052d863 100644
--- a/test/5.7-lprm.sh
+++ b/test/5.7-lprm.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: 5.7-lprm.sh 7409 2008-03-29 00:26:03Z mike $"
+# "$Id$"
 #
 #   Test the lprm command.
 #
@@ -43,5 +43,5 @@ fi
 echo ""
 
 #
-# End of "$Id: 5.7-lprm.sh 7409 2008-03-29 00:26:03Z mike $".
+# End of "$Id$".
 #
diff --git a/test/5.8-cancel.sh b/test/5.8-cancel.sh
index 9ecb3f3a06..11f599cd37 100644
--- a/test/5.8-cancel.sh
+++ b/test/5.8-cancel.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: 5.8-cancel.sh 7409 2008-03-29 00:26:03Z mike $"
+# "$Id$"
 #
 #   Test the cancel command.
 #
@@ -53,5 +53,5 @@ fi
 echo ""
 
 #
-# End of "$Id: 5.8-cancel.sh 7409 2008-03-29 00:26:03Z mike $".
+# End of "$Id$".
 #
diff --git a/test/5.9-lpinfo.sh b/test/5.9-lpinfo.sh
index a6ea3645e2..adb041b0ad 100644
--- a/test/5.9-lpinfo.sh
+++ b/test/5.9-lpinfo.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: 5.9-lpinfo.sh 7711 2008-07-02 04:39:27Z mike $"
+# "$Id$"
 #
 #   Test the lpinfo command.
 #
@@ -51,5 +51,5 @@ fi
 echo ""
 
 #
-# End of "$Id: 5.9-lpinfo.sh 7711 2008-07-02 04:39:27Z mike $".
+# End of "$Id$".
 #
diff --git a/test/get-jobs.test b/test/get-jobs.test
index 13b9959c25..d4c3a0a800 100644
--- a/test/get-jobs.test
+++ b/test/get-jobs.test
@@ -1,5 +1,5 @@
 #
-# "$Id: get-jobs.test 9702 2011-04-20 21:16:08Z mike $"
+# "$Id$"
 #
 #   Get list of not-completed jobs.
 #
@@ -49,5 +49,5 @@
 
 
 #
-# End of "$Id: get-jobs.test 9702 2011-04-20 21:16:08Z mike $".
+# End of "$Id$".
 #
diff --git a/test/onepage-a4-300-black-1.pwg.gz b/test/onepage-a4-300-black-1.pwg.gz
new file mode 100644
index 0000000000..0a559fc167
Binary files /dev/null and b/test/onepage-a4-300-black-1.pwg.gz differ
diff --git a/test/onepage-letter-300-black-1.pwg.gz b/test/onepage-letter-300-black-1.pwg.gz
new file mode 100644
index 0000000000..8fd7386e39
Binary files /dev/null and b/test/onepage-letter-300-black-1.pwg.gz differ
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 7aaba74264..6779b875c0 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: run-stp-tests.sh 9034 2010-03-09 07:03:06Z mike $"
+# "$Id$"
 #
 #   Perform the complete set of IPP compliance tests specified in the
 #   CUPS Software Test Plan.
@@ -346,38 +346,97 @@ ln -s $root/templates /tmp/cups-$user/share
 # Local filters and configuration files...
 #
 
+instfilter() {
+	# instfilter src dst format
+	#
+	# See if the filter exists in a standard location; if so, make a
+	# symlink, otherwise create a dummy script for the specified format.
+	#
+	src="$1"
+	dst="$2"
+	format="$3"
+
+	for dir in /usr/libexec/cups/filter /usr/lib/cups/filter; do
+		if test -x "$dir/$src"; then
+			ln -s "$dir/$src" "/tmp/cups-$user/bin/filter/$dst"
+			return
+		fi
+	done
+
+	# Source filter not present, create a dummy filter
+	case $format in
+		passthru)
+			ln -s gziptoany "/tmp/cups-$user/bin/filter/$dst"
+			;;
+		pdf)
+			cat >"/tmp/cups-$user/bin/filter/$dst" <<EOF
+#!/bin/sh
+case "\$5" in
+	*media=a4* | *media=iso_a4* | *PageSize=A4*)
+		cat "$root/test/onepage-a4.pdf"
+		;;
+	*)
+		cat "$root/test/onepage-letter.pdf"
+		;;
+esac
+EOF
+			chmod +x "/tmp/cups-$user/bin/filter/$dst"
+			;;
+		ps)
+			cat >"/tmp/cups-$user/bin/filter/$dst" <<EOF
+#!/bin/sh
+case "\$5" in
+	*media=a4* | *media=iso_a4* | *PageSize=A4*)
+		cat "$root/test/onepage-a4.ps"
+		;;
+	*)
+		cat "$root/test/onepage-letter.ps"
+		;;
+esac
+EOF
+			chmod +x "/tmp/cups-$user/bin/filter/$dst"
+			;;
+		raster)
+			cat >"/tmp/cups-$user/bin/filter/$dst" <<EOF
+#!/bin/sh
+case "\$5" in
+	*media=a4* | *media=iso_a4* | *PageSize=A4*)
+		gunzip -c "$root/test/onepage-a4-300-black-1.pwg.gz"
+		;;
+	*)
+		gunzip -c "$root/test/onepage-letter-300-black-1.pwg.gz"
+		;;
+esac
+EOF
+			chmod +x "/tmp/cups-$user/bin/filter/$dst"
+			;;
+	esac
+}
+ 
+ln -s $root/test/test.convs /tmp/cups-$user/share/mime
+
 if test `uname` = Darwin; then
-	ln -s /usr/libexec/cups/filter/cgpdfto* /tmp/cups-$user/bin/filter
-	ln -s /usr/libexec/cups/filter/cgbannertopdf /tmp/cups-$user/bin/filter
-	ln -s /usr/libexec/cups/filter/cgimagetopdf /tmp/cups-$user/bin/filter
-	ln -s /usr/libexec/cups/filter/cgtexttopdf /tmp/cups-$user/bin/filter
-	ln -s /usr/libexec/cups/filter/nsimagetopdf /tmp/cups-$user/bin/filter
-	ln -s /usr/libexec/cups/filter/nstexttopdf /tmp/cups-$user/bin/filter
-	ln -s /usr/libexec/cups/filter/pictwpstops /tmp/cups-$user/bin/filter
-	ln -s /usr/libexec/cups/filter/pstoappleps /tmp/cups-$user/bin/filter
-	ln -s /usr/libexec/cups/filter/pstocupsraster /tmp/cups-$user/bin/filter
-	ln -s /usr/libexec/cups/filter/pstopdffilter /tmp/cups-$user/bin/filter
-	ln -s /usr/libexec/cups/filter/rastertourf /tmp/cups-$user/bin/filter
-	ln -s /usr/libexec/cups/filter/xhtmltopdf /tmp/cups-$user/bin/filter
-
-	if test -f /private/etc/cups/apple.types; then
-		ln -s /private/etc/cups/apple.* /tmp/cups-$user/share/mime
-	elif test -f /usr/share/cups/mime/apple.types; then
-		ln -s /usr/share/cups/mime/apple.* /tmp/cups-$user/share/mime
-	fi
+	instfilter cgbannertopdf bannertopdf pdf
+	instfilter cgimagetopdf imagetopdf pdf
+	instfilter cgpdftopdf pdftopdf passthru
+	instfilter cgpdftops pdftops ps
+	instfilter cgpdftoraster pdftoraster raster
+	instfilter cgtexttopdf texttopdf pdf
+	instfilter pstocupsraster pstoraster raster
+	instfilter pstopdffilter pstopdf pdf
 else
-	ln -s /usr/lib/cups/filter/bannertops /tmp/cups-$user/bin/filter
-	ln -s /usr/lib/cups/filter/imagetops /tmp/cups-$user/bin/filter
-	ln -s /usr/lib/cups/filter/imagetoraster /tmp/cups-$user/bin/filter
-	ln -s /usr/lib/cups/filter/pdftops /tmp/cups-$user/bin/filter
-	ln -s /usr/lib/cups/filter/texttops /tmp/cups-$user/bin/filter
-
-	ln -s /usr/share/cups/mime/legacy.convs /tmp/cups-$user/share/mime
-	ln -s /usr/share/cups/charsets /tmp/cups-$user/share
-	if test -f $root/data/psglyphs; then
-		ln -s /usr/share/cups/data/psglyphs $root/data
+	instfilter bannertopdf bannertopdf pdf
+	instfilter bannertops bannertops ps
+	instfilter imagetopdf imagetopdf pdf
+	instfilter pdftopdf pdftopdf passthru
+	instfilter pdftops pdftops ps
+	instfilter pdftoraster pdftoraster raster
+	instfilter pstoraster pstoraster raster
+	instfilter texttopdf texttopdf pdf
+
+	if test -d /usr/share/cups/charsets; then
+		ln -s /usr/share/cups/charsets /tmp/cups-$user/share
 	fi
-	ln -s /usr/share/cups/fonts /tmp/cups-$user/share
 fi
 
 #
@@ -853,7 +912,7 @@ else
 fi
 
 # Warning log messages
-count=`$GREP '^W ' /tmp/cups-$user/log/error_log | wc -l | awk '{print $1}'`
+count=`$GREP '^W ' /tmp/cups-$user/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
 if test $count != 9; then
 	echo "FAIL: $count warning messages, expected 9."
 	$GREP '^W ' /tmp/cups-$user/log/error_log
@@ -960,5 +1019,5 @@ if test $fail != 0; then
 fi
 
 #
-# End of "$Id: run-stp-tests.sh 9034 2010-03-09 07:03:06Z mike $"
+# End of "$Id$"
 #
diff --git a/test/test.convs b/test/test.convs
new file mode 100644
index 0000000000..94ce07a066
--- /dev/null
+++ b/test/test.convs
@@ -0,0 +1,9 @@
+# Test file listing potential filters for conversions
+application/pdf application/vnd.cups-pdf 100 pdftopdf
+application/pdf application/postscript 100 pdftops
+application/pdf application/vnd.cups-raster 100 pdftoraster
+application/postscript application/vnd.cups-raster 100 pstoraster
+application/vnd.cups-banner application/pdf 100 bannertopdf
+image/jpeg application/pdf 100 imagetopdf
+text/plain application/pdf 100 texttopdf
+
diff --git a/test/testhp.ppd b/test/testhp.ppd
index 6200c7abac..d90dd587c9 100644
--- a/test/testhp.ppd
+++ b/test/testhp.ppd
@@ -1,32 +1,32 @@
 *PPD-Adobe: "4.3"
 *%
-*% "$Id: testhp.ppd 6649 2007-07-11 21:46:42Z mike $"
+*% "$Id$"
 *%
-*%   Test HP PPD file for CUPS.
+*% Test HP PPD file for CUPS.
 *%
-*%   Copyright 2007-2011 by Apple Inc.
-*%   Copyright 1997-2005 by Easy Software Products.
+*% Copyright 2007-2013 by Apple Inc.
+*% Copyright 1997-2005 by Easy Software Products.
 *%
-*%   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/".
+*% 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/".
 *%
 *FormatVersion:	"4.3"
-*FileVersion:	"1.1"
+*FileVersion:	"1.7"
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName:	"TESTHP.PPD"
 *Manufacturer:	"ESP"
 *Product:	"(CUPS v1.5)"
-*cupsVersion:	1.1
+*cupsVersion:	1.7
 *cupsManualCopies: True
 *cupsFilter:	"application/vnd.cups-raster 50 rastertohp"
 *cupsFilter2:	"application/vnd.cups-raster application/vnd.hp-pcl 50 rastertohp"
 *ModelName:     "Test HP Printer"
 *ShortNickName: "Test HP Printer"
-*NickName:      "Test HP Printer CUPS v1.1"
+*NickName:      "Test HP Printer CUPS v1.7"
 *PSVersion:	"(3010.000) 550"
 *LanguageLevel:	"3"
 *ColorDevice:	True
@@ -133,9 +133,10 @@
 
 *OpenUI *Resolution/Output Resolution: PickOne
 *OrderDependency: 20 AnySetup *Resolution
-*DefaultResolution: 100dpi
-*Resolution 75dpi/75 DPI: "<</HWResolution[75 75]>>setpagedevice"
-*Resolution 100dpi/100 DPI: "<</HWResolution[100 100]>>setpagedevice"
+*DefaultResolution: 300dpi
+*Resolution 150dpi/150 DPI: "<</HWResolution[150 150]>>setpagedevice"
+*Resolution 300dpi/300 DPI: "<</HWResolution[300 300]>>setpagedevice"
+*Resolution 600dpi/600 DPI: "<</HWResolution[600 600]>>setpagedevice"
 *CloseUI: *Resolution
 
 *OpenUI *ColorModel/Output Mode: PickOne
@@ -183,5 +184,5 @@
 *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
 *Font ZapfDingbats: Special "(001.004S)" Standard ROM
 *%
-*% End of "$Id: testhp.ppd 6649 2007-07-11 21:46:42Z mike $".
+*% End of "$Id$".
 *%
diff --git a/test/testps.ppd b/test/testps.ppd
index 10b4a37748..a200c4a501 100644
--- a/test/testps.ppd
+++ b/test/testps.ppd
@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *%
-*% "$Id: testps.ppd 6649 2007-07-11 21:46:42Z mike $"
+*% "$Id$"
 *%
 *%   Test PS PPD file for CUPS.
 *%
@@ -179,5 +179,5 @@
 *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
 *Font ZapfDingbats: Special "(001.004S)" Standard ROM
 *%
-*% End of "$Id: testps.ppd 6649 2007-07-11 21:46:42Z mike $".
+*% End of "$Id$".
 *%