[lucene2] 42/104: Disable the contrib/benchmark tests, since they need to download stuff to run

[Kai-Chung Yan]

This is an automated email from the git hooks/post-receive script.

seamlik-guest pushed a commit to branch master
in repository lucene2.

commit 084f588e5c7d924070a89ee757fa1ecbda43a07c
Author: Jan-Pascal van Best <janpascal at vanbest.org>
Date:   Fri Feb 1 09:43:52 2008 +0000

    Disable the contrib/benchmark tests, since they need to download stuff to run
---
 debian/changelog                                   |  4 +++-
 debian/patches/00list                              |  2 +-
 .../80_prevent-downloading-data-files.dpatch       | 23 ++++++++++++++++++++++
 debian/rules                                       |  2 ++
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ca13998..4eff0bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,8 +24,10 @@ lucene2 (2.3.0+ds1-1) UNRELEASED; urgency=low
     main package
   * Added Debian packaging copyright information
   * Added missing descriptions to patch files
+  * Prevent the test run to download anything, which would not work for
+    autobuilders
 
- -- Jan-Pascal van Best <janpascal at vanbest.org>  Fri, 01 Feb 2008 07:16:26 +0100
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Fri, 01 Feb 2008 10:42:29 +0100
 
 lucene2 (2.2.0-2) unstable; urgency=low
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 07434fa..1c979cb 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,6 +1,5 @@
 01_remove_all_jarfiles.dpatch
 10_fix-javacc-locations.dpatch
-#20_remove-gdata-server.dpatch
 30_fix-contrib-ant-libs.dpatch
 40_fix-contrib-benchmark-libs.dpatch
 50_fix-contrib-db-libs.dpatch
@@ -8,5 +7,6 @@
 60_fix-contrib-lucli-libs.dpatch
 61_lucli-script.dpatch
 70_fix-contrib-regex-libs.dpatch
+80_prevent-downloading-data-files.dpatch
 #80_fix-javadocs-classpath.dpatch
 #81_fix-javadocs-links.dpatch
diff --git a/debian/patches/80_prevent-downloading-data-files.dpatch b/debian/patches/80_prevent-downloading-data-files.dpatch
new file mode 100755
index 0000000..befc573
--- /dev/null
+++ b/debian/patches/80_prevent-downloading-data-files.dpatch
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 80_prevent-downloading-data-files.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Disable running the tests for contrib/benchmark, since it requires
+## DP: downloading test data which may not be possible during automated builds
+
+ at DPATCH@
+diff -urNad lucene2~/contrib/benchmark/build.xml lucene2/contrib/benchmark/build.xml
+--- lucene2~/contrib/benchmark/build.xml	2008-02-01 10:11:32.000000000 +0100
++++ lucene2/contrib/benchmark/build.xml	2008-02-01 10:12:47.000000000 +0100
+@@ -167,9 +167,8 @@
+ 
+     <target name="init" depends="common.init,compile-demo,check-files"/>
+ 
+-    <!-- make sure online collections (reuters) are first downloaded -->
+-    <target name="test" depends="init,get-files">
+-      <antcall target="common.test" inheritRefs="true" />
++    <!-- test empty, since automatic builds cannot download test data -->
++    <target name="test" depends="init">
+     </target>
+     
+ </project>
diff --git a/debian/rules b/debian/rules
index d7b2ccf..b129ed2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,6 +31,8 @@ clean::
 	# Same for 'ant test' in contrib/benchmark
 	rm -rf $(CURDIR)/contrib/benchmark/temp
 	rm -rf $(CURDIR)/contrib/benchmark/work/index
+	rm -rf $(CURDIR)/contrib/benchmark/work/reuters
+	rm -rf $(CURDIR)/contrib/benchmark/work/reuters-out
 	# remove keyring, since it is a binary file
 	rm -f debian/lucene-keyring.gpg
 	# remove all javacc-generated files from src and contrib, except those

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene2.git