[pkg-java] r17664 - in trunk/c3p0/debian: . patches

[Markus Koschany]

Author: apo-guest
Date: 2014-01-16 10:41:51 +0000 (Thu, 16 Jan 2014)
New Revision: 17664

Removed:
   trunk/c3p0/debian/patches/disable-asynchronous-runnner-tests.patch
Modified:
   trunk/c3p0/debian/ant.properties
   trunk/c3p0/debian/changelog
   trunk/c3p0/debian/patches/series
   trunk/c3p0/debian/watch
Log:
Disable all Junit tests


Modified: trunk/c3p0/debian/ant.properties
===================================================================
--- trunk/c3p0/debian/ant.properties	2014-01-16 10:22:47 UTC (rev 17663)
+++ trunk/c3p0/debian/ant.properties	2014-01-16 10:41:51 UTC (rev 17664)
@@ -55,22 +55,22 @@
 # the various tests. very optional
 #
 
-test.jdbc.driver.jar.file=/usr/share/java/hsqldb.jar
-test.jdbc.drivers=org.hsqldb.jdbcDriver
-test.jdbc.url=jdbc:hsqldb:file:/tmp/testdb
-test.jdbc.user=SA
-test.jdbc.password=
+#test.jdbc.driver.jar.file=/usr/share/java/hsqldb.jar
+#test.jdbc.drivers=org.hsqldb.jdbcDriver
+#test.jdbc.url=jdbc:hsqldb:file:/tmp/testdb
+#test.jdbc.user=SA
+#test.jdbc.password=
 
-c3p0.jdbcUrl=jdbc:hsqldb:file:/tmp/testdb
-c3p0.driverClass=org.hsqldb.jdbcDriver
-c3p0.user=SA
-c3p0.password=
+#c3p0.jdbcUrl=jdbc:hsqldb:file:/tmp/testdb
+#c3p0.driverClass=org.hsqldb.jdbcDriver
+#c3p0.user=SA
+#c3p0.password=
 
 #
 # required if you want to run junit tests
 #
 
-junit.jar.file=/usr/share/java/junit.jar
+#junit.jar.file=/usr/share/java/junit.jar
 
 # >> VERY VERY OPTIONAL DOCS-TO-WEB SUPPORT
 

Modified: trunk/c3p0/debian/changelog
===================================================================
--- trunk/c3p0/debian/changelog	2014-01-16 10:22:47 UTC (rev 17663)
+++ trunk/c3p0/debian/changelog	2014-01-16 10:41:51 UTC (rev 17664)
@@ -1,14 +1,13 @@
 c3p0 (0.9.1.2-9) unstable; urgency=medium
 
   * Team upload.
-  * Add disable-asynchronous-runner-tests.patch. Disable optional Junit tests
-    that can cause the build process to hang. (Closes: #725456)
+  * debian/ant.properties: Disable optional Junit tests. (Closes: #725456)
   * Update watch file to detect the latest upstream release.
     Thanks to Bart Martens.
   * Declare compliance with Debian Policy 3.9.5.
   * Bump compat level to 9 and require debhelper >= 9.
 
- -- Markus Koschany <apo at gambaru.de>  Wed, 15 Jan 2014 14:56:37 +0100
+ -- Markus Koschany <apo at gambaru.de>  Thu, 16 Jan 2014 11:36:02 +0100
 
 c3p0 (0.9.1.2-8) unstable; urgency=low
 

Deleted: trunk/c3p0/debian/patches/disable-asynchronous-runnner-tests.patch
===================================================================
--- trunk/c3p0/debian/patches/disable-asynchronous-runnner-tests.patch	2014-01-16 10:22:47 UTC (rev 17663)
+++ trunk/c3p0/debian/patches/disable-asynchronous-runnner-tests.patch	2014-01-16 10:41:51 UTC (rev 17664)
@@ -1,21 +0,0 @@
-From: Markus Koschany <apo at gambaru.de>
-Date: Wed, 15 Jan 2014 14:10:24 +0100
-Subject: disable asynchronous runnner tests
-
----
- build.xml | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/build.xml b/build.xml
-index b03cab6..3d53fc4 100644
---- a/build.xml
-+++ b/build.xml
-@@ -605,6 +605,8 @@
- 			<batchtest fork="yes" toDir="${build.testresults.dir}">
- 				<fileset dir="${build.classes.dir}">
- 					<include name="**/*JUnitTestCase.class"/>
-+					<exclude name="**/ThreadPoolAsynchronousRunnerJUnitTestCase.class"/>
-+					<exclude name="**/ThreadPerTaskAsynchronousRunnerJUnitTestCase.class"/>
- 				</fileset>
- 			</batchtest>
- 		</junit>

Modified: trunk/c3p0/debian/patches/series
===================================================================
--- trunk/c3p0/debian/patches/series	2014-01-16 10:22:47 UTC (rev 17663)
+++ trunk/c3p0/debian/patches/series	2014-01-16 10:41:51 UTC (rev 17664)
@@ -1,4 +1,3 @@
 build.patch
 testing.patch
 java-7-compat.patch
-disable-asynchronous-runnner-tests.patch

Modified: trunk/c3p0/debian/watch
===================================================================
--- trunk/c3p0/debian/watch	2014-01-16 10:22:47 UTC (rev 17663)
+++ trunk/c3p0/debian/watch	2014-01-16 10:41:51 UTC (rev 17664)
@@ -1,3 +1,3 @@
 version=3
 opts=uversionmangle=s/\.src$//;s/^(\S+\.bin)$/0.0.$1/;s/-(pre\d*)$/~$1/ \
-http://qa.debian.org/watch/sf.php/c3p0/c3p0[_\-](\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz) debian debian/orig-tar.sh
+http://qa.debian.org/watch/sf.php/c3p0/c3p0[_\-](\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)