Re-enable Solr tests on Linux and Windows Jenkins. !!! Hack !!!: Disable *all* of Solr on FreeBSD Jenkins (via sysprop)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1415781 13f79535-47bb-0310-9956-ffa450edef68

build.xml

@@ -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>
 

solr/common-build.xml

@@ -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>