You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2014/05/29 03:29:26 UTC

svn commit: r1598191 - in /manifoldcf/trunk: CHANGES.txt connectors/elasticsearch/build.xml framework/buildfiles/connector-build.xml

Author: kwright
Date: Thu May 29 01:29:25 2014
New Revision: 1598191

URL: http://svn.apache.org/r1598191
Log:
Fix for CONNECTORS-947

Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/connectors/elasticsearch/build.xml
    manifoldcf/trunk/framework/buildfiles/connector-build.xml

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1598191&r1=1598190&r2=1598191&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Thu May 29 01:29:25 2014
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 1.7-dev =====================
 
+CONNECTORS-947: ant test fails when make-deps is not run.
+(Karl Wright)
+
 CONNECTORS-945: GridFS connector.
 (Muhammed Olgun)
 

Modified: manifoldcf/trunk/connectors/elasticsearch/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/build.xml?rev=1598191&r1=1598190&r2=1598191&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/elasticsearch/build.xml (original)
+++ manifoldcf/trunk/connectors/elasticsearch/build.xml Thu May 29 01:29:25 2014
@@ -69,7 +69,7 @@
     </target>
 
     <target name="calculate-testcode-condition">
-        <available file="test-materials-proprietary" property="tests-present"/>
+        <available file="test-materials-proprietary/elasticsearch-1.0.1" property="tests-present"/>
     </target>
 
     <path id="connector-test-classpath">

Modified: manifoldcf/trunk/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/buildfiles/connector-build.xml?rev=1598191&r1=1598190&r2=1598191&view=diff
==============================================================================
--- manifoldcf/trunk/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/trunk/framework/buildfiles/connector-build.xml Thu May 29 01:29:25 2014
@@ -290,7 +290,7 @@
         </javac>
     </target>
 
-    <target name="has-tests-check" depends="precompile-check" if="canBuild">
+    <target name="has-tests-check" depends="pretest-check" if="canTest">
         <available file="connector/src/test/java" property="hasTests"/>
     </target>