svn commit: r1415781 - in /lucene/dev/trunk: build.xml solr/common-build.xml

[us...@apache.org]

Author: uschindler
Date: Fri Nov 30 18:33:44 2012
New Revision: 1415781

URL: http://svn.apache.org/viewvc?rev=1415781&view=rev
Log:
Re-enable Solr tests on Linux and Windows Jenkins. !!! Hack !!!: Disable *all* of Solr on FreeBSD Jenkins (via sysprop)

Modified:
    lucene/dev/trunk/build.xml
    lucene/dev/trunk/solr/common-build.xml

Modified: lucene/dev/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/build.xml?rev=1415781&r1=1415780&r2=1415781&view=diff
==============================================================================
--- lucene/dev/trunk/build.xml (original)
+++ lucene/dev/trunk/build.xml Fri Nov 30 18:33:44 2012
@@ -38,9 +38,7 @@
   <target name="test" description="Test both Lucene and Solr">
     <subant target="test" inheritall="false" failonerror="true">
       <fileset dir="lucene" includes="build.xml" />
-      <!-- enable again when solr tests are passing
       <fileset dir="solr" includes="build.xml" />
-      -->
     </subant>
   </target>
 

Modified: lucene/dev/trunk/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/common-build.xml?rev=1415781&r1=1415780&r2=1415781&view=diff
==============================================================================
--- lucene/dev/trunk/solr/common-build.xml (original)
+++ lucene/dev/trunk/solr/common-build.xml Fri Nov 30 18:33:44 2012
@@ -432,4 +432,9 @@
     <delete dir="${dest}/web" includes="**/*" failonerror="false"/>
     <contrib-crawl target="add-to-war"/>
   </target>
+  
+  <!-- hack for now to disable *all* Solr tests on Jenkins when "tests.disable-solr" property is set -->
+  <target name="test" unless="tests.disable-solr">
+    <antcall target="common.test"/>
+  </target>
 </project>