Imported Upstream version 1.5.3upstream/1.5.3

5 files changed, 43 insertions, 27 deletions

diff --git a/test/Dependencies b/test/Dependencies
index 1c296636..32891447 100644
--- a/test/Dependencies
+++ b/test/Dependencies
@@ -3,17 +3,18 @@
 ippserver.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 ippserver.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h
 ippserver.o: ../cups/array.h ../cups/language.h ../cups/string-private.h
-ippserver.o: ../config.h ../cups/debug-private.h ../cups/ppd-private.h
-ippserver.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h
-ippserver.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h
-ippserver.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h
-ippserver.o: ../cups/transcode.h ../cups/thread-private.h
+ippserver.o: ../config.h ../cups/debug-private.h ../cups/versioning.h
+ippserver.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
+ippserver.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
+ippserver.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
+ippserver.o: ../cups/language-private.h ../cups/transcode.h
+ippserver.o: ../cups/thread-private.h
 ipptool.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 ipptool.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
 ipptool.o: ../cups/language.h ../cups/string-private.h ../config.h
-ipptool.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
-ipptool.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
-ipptool.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
-ipptool.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
-ipptool.o: ../cups/thread-private.h ../cups/file-private.h
-ipptool.o: ../cups/cups-private.h
+ipptool.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h
+ipptool.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h
+ipptool.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h
+ipptool.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h
+ipptool.o: ../cups/transcode.h ../cups/thread-private.h
+ipptool.o: ../cups/file-private.h ../cups/cups-private.h
diff --git a/test/Makefile b/test/Makefile
index 36c73669..0acc0b4c 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 10001 2011-09-14 22:38:58Z mike $"
+# "$Id: Makefile 10317 2012-03-01 00:05:55Z mike $"
 #
 #   IPP test makefile for CUPS.
 #
@@ -20,20 +20,13 @@ include ../Makedefs
 # Sample test files.
 #
 
-TESTFILES	=	\
+DATAFILES	=	\
 			color.jpg \
-			create-printer-subscription.test \
 			document-a4.pdf \
 			document-a4.ps \
 			document-letter.pdf \
 			document-letter.ps \
-			get-completed-jobs.test \
-			get-jobs.test \
 			gray.jpg \
-			ipp-1.1.test \
-			ipp-2.0.test \
-			ipp-2.1.test \
-			ipp-2.2.test \
 			onepage-a4.pdf \
 			onepage-a4.ps \
 			onepage-letter.pdf \
@@ -42,6 +35,15 @@ TESTFILES	=	\
 			testfile.pdf \
 			testfile.ps \
 			testfile.txt
+TESTFILES	=	\
+			create-printer-subscription.test \
+			get-completed-jobs.test \
+			get-jobs.test \
+			get-printer-attributes.test \
+			ipp-1.1.test \
+			ipp-2.0.test \
+			ipp-2.1.test \
+			ipp-2.2.test
 OBJS		=	\
 			ippserver.o \
 			ipptool.o
@@ -102,6 +104,9 @@ install:	all install-data install-headers install-libs install-exec
 install-data:
 	echo Installing sample ipptool files in $(DATADIR)/ipptool...
 	$(INSTALL_DIR) -m 755 $(DATADIR)/ipptool
+	for file in $(DATAFILES); do \
+		$(INSTALL_COMPDATA) $$file $(DATADIR)/ipptool; \
+	done
 	for file in $(TESTFILES); do \
 		$(INSTALL_DATA) $$file $(DATADIR)/ipptool; \
 	done
@@ -140,6 +145,14 @@ install-libs:
 #
 
 uninstall:
+	echo Uninstalling sample ipptool files from $(DATADIR)/ipptool...
+	for file in $(DATAFILES); do \
+		$(RM) $(DATADIR)/ipptool/$$file; \
+	done
+	for file in $(TESTFILES); do \
+		$(RM) $(DATADIR)/ipptool/$$file; \
+	done
+	-$(RMDIR) $(DATADIR)/ipptool
 
 
 #
@@ -188,5 +201,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 10001 2011-09-14 22:38:58Z mike $".
+# End of "$Id: Makefile 10317 2012-03-01 00:05:55Z mike $".
 #
diff --git a/test/get-jobs.test b/test/get-jobs.test
index 4da5f6a7..c7a07f6e 100644
--- a/test/get-jobs.test
+++ b/test/get-jobs.test
@@ -1,9 +1,9 @@
 #
-# "$Id: get-jobs.test 9702 2011-04-20 21:16:08Z mike $"
+# "$Id: get-jobs.test 10233 2012-02-06 18:55:39Z mike $"
 #
 #   Get list of not-completed jobs.
 #
-#   Copyright 2007-2010 by Apple Inc.
+#   Copyright 2007-2012 by Apple Inc.
 #   Copyright 2001-2006 by Easy Software Products. All rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -32,6 +32,7 @@
 	ATTR uri printer-uri $uri
 	ATTR keyword requested-attributes
 	     job-id,job-state,job-name,job-originating-user-name,job-media-sheets,job-media-sheets-completed,job-impressions,job-impressions-completed
+	ATTR name requesting-user-name $user
 
 	# What statuses are OK?
 	STATUS successful-ok
@@ -49,5 +50,5 @@
 
 
 #
-# End of "$Id: get-jobs.test 9702 2011-04-20 21:16:08Z mike $".
+# End of "$Id: get-jobs.test 10233 2012-02-06 18:55:39Z mike $".
 #
diff --git a/test/print-job.test b/test/print-job.test
index a830a124..079dfa5e 100644
--- a/test/print-job.test
+++ b/test/print-job.test
@@ -12,6 +12,7 @@
 	ATTR language attributes-natural-language en
 	ATTR uri printer-uri $uri
 	ATTR name requesting-user-name $user
+	ATTR mimeMediaType document-format $filetype
 
 	GROUP job-attributes-tag
 	ATTR integer copies 1
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 72f52f0c..7b6d1b72 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: run-stp-tests.sh 10090 2011-10-25 22:39:56Z mike $"
+# "$Id: run-stp-tests.sh 10464 2012-05-15 14:04:18Z mike $"
 #
 #   Perform the complete set of IPP compliance tests specified in the
 #   CUPS Software Test Plan.
@@ -485,7 +485,7 @@ echo "Starting scheduler:"
 echo "    $valgrind ../scheduler/cupsd -c /tmp/cups-$user/cupsd.conf -f >/tmp/cups-$user/log/debug_log 2>&1 &"
 echo ""
 
-if test `uname` = Darwin -a "x$valgrind" = x; then
+if test `uname` = Darwin -a "x$valgrind" = x -a -f /usr/lib/libgmalloc.dylib; then
 	DYLD_INSERT_LIBRARIES=/usr/lib/libgmalloc.dylib \
 	$valgrind ../scheduler/cupsd -c /tmp/cups-$user/cupsd.conf -f >/tmp/cups-$user/log/debug_log 2>&1 &
 else
@@ -870,5 +870,5 @@ if test $fail != 0; then
 fi
 
 #
-# End of "$Id: run-stp-tests.sh 10090 2011-10-25 22:39:56Z mike $"
+# End of "$Id: run-stp-tests.sh 10464 2012-05-15 14:04:18Z mike $"
 #