Pull up fix for CONNECTORS-947 from trunk
git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/branches/release-1.6-branch@1598192 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index ccbf2e3..e50754b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,9 @@
======================= Release 1.6.1 =====================
+CONNECTORS-947: ant test fails when make-deps is not run.
+(Karl Wright)
+
CONNECTORS-944: Maven build has different stuff in war file than
ant build.
(Arcadius Ahouansou, Karl Wright)
diff --git a/connectors/elasticsearch/build.xml b/connectors/elasticsearch/build.xml
index d1eac70..4b56830 100644
--- a/connectors/elasticsearch/build.xml
+++ b/connectors/elasticsearch/build.xml
@@ -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">
diff --git a/framework/buildfiles/connector-build.xml b/framework/buildfiles/connector-build.xml
index 7072fb6..edf06a1 100644
--- a/framework/buildfiles/connector-build.xml
+++ b/framework/buildfiles/connector-build.xml
@@ -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>
