[Pkg-cups-devel] r709 - in cupsys/trunk: . debian debian/patches

[Martin Pitt]

Author: mpitt
Date: Sun Mar 16 19:28:18 2008
New Revision: 709

Log:
* Add testsuite-exit-code.dpatch: Exit with nonzero if the test suite fails,
  so that it is easier to integrate into package building.

Added:
   cupsys/trunk/debian/patches/testsuite-exit-code.dpatch   (contents, props changed)
Modified:
   cupsys/trunk/   (props changed)
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/patches/00list

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Sun Mar 16 19:28:18 2008
@@ -22,8 +22,10 @@
   * pidfile.dpatch: Specify PidFile in temporary directory in the self test's
     cupsd.conf.
   * debian/rules clean: Remove test suite HTML reports.
+  * Add testsuite-exit-code.dpatch: Exit with nonzero if the test suite fails,
+    so that it is easier to integrate into package building.
 
- -- Martin Pitt <mpitt at debian.org>  Sun, 16 Mar 2008 19:56:53 +0100
+ -- Martin Pitt <mpitt at debian.org>  Sun, 16 Mar 2008 20:04:04 +0100
 
 cupsys (1.3.6-1) unstable; urgency=low
 

Modified: cupsys/trunk/debian/patches/00list
==============================================================================
--- cupsys/trunk/debian/patches/00list	(original)
+++ cupsys/trunk/debian/patches/00list	Sun Mar 16 19:28:18 2008
@@ -14,3 +14,4 @@
 search_mime_files_in_usr_share.dpatch
 pdftops-cups-1.4.dpatch
 pbmprint.dpatch
+testsuite-exit-code.dpatch

Added: cupsys/trunk/debian/patches/testsuite-exit-code.dpatch
==============================================================================
--- (empty file)
+++ cupsys/trunk/debian/patches/testsuite-exit-code.dpatch	Sun Mar 16 19:28:18 2008
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## testsuite-exit-code.dpatch by  <mpitt at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: If any test fails, exit with nonzero. This makes it easier to integrate into package build scripts.
+## DP: Forwarded to http://www.cups.org/str.php?L2758
+
+ at DPATCH@
+diff -urNad trunk~/test/run-stp-tests.sh trunk/test/run-stp-tests.sh
+--- trunk~/test/run-stp-tests.sh	2008-03-16 19:55:04.000000000 +0100
++++ trunk/test/run-stp-tests.sh	2008-03-16 19:57:39.000000000 +0100
+@@ -590,14 +590,18 @@
+ 
+ if test $fail != 0; then
+ 	echo "$fail tests failed."
++        EXITCODE=1
+ else
+ 	echo "All tests were successful."
++        EXITCODE=0
+ fi
+ 
+ echo "Log files can be found in /tmp/cups-$user/log."
+ echo "A HTML report was created in test/$strfile."
+ echo ""
+ 
++exit $EXITCODE
++
+ #
+ # End of "$Id: run-stp-tests.sh 6649 2007-07-11 21:46:42Z mike $"
+ #