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 2020/05/03 11:56:07 UTC
svn commit: r1877320 - in
/manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch: build.xml
connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseITHSQLDB.java
Author: kwright
Date: Sun May 3 11:56:07 2020
New Revision: 1877320
URL: http://svn.apache.org/viewvc?rev=1877320&view=rev
Log:
Get the windows side to work too
Modified:
manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/build.xml
manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseITHSQLDB.java
Modified: manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/build.xml?rev=1877320&r1=1877319&r2=1877320&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/build.xml Sun May 3 11:56:07 2020
@@ -45,24 +45,27 @@
<get src="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${elasticsearch.version}-linux-x86_64.tar.gz"
dest="build/download/elasticsearch.tar.gz"/>
<gunzip src="build/download/elasticsearch.tar.gz"/>
- <untar src="build/download/elasticsearch.tar" dest="test-materials"/>
+ <mkdir dir="test-materials/unix"/>
+ <untar src="build/download/elasticsearch.tar" dest="test-materials/unix"/>
+ <chmod dir="test-materials/unix/elasticsearch-${elasticsearch.version}" perm="ugo+rxw">
+ <fileset dir="**/*"/>
+ </chmod>
+ <chmod file="test-materials/unix/elasticsearch-${elasticsearch.version}/bin/elasticsearch" perm="ugo+rx"/>
+
</target>
<target name="download-elasticsearch-windows" if="isWindows">
<mkdir dir="build/download"/>
- <get src="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${elasticsearch.version}-windows-x86_64.tar.gz"
+ <get src="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${elasticsearch.version}-windows-x86_64.zip"
dest="build/download/elasticsearch.zip"/>
- <unzip src="build/download/elasticsearch.zip" dest="test-materials"/>
+ <mkdir dir="test-materials/windows"/>
+ <unzip src="build/download/elasticsearch.zip" dest="test-materials/windows"/>
</target>
<target name="download-elasticsearch" depends="download-elasticsearch-unix,download-elasticsearch-windows">
</target>
<target name="download-dependencies" depends="download-elasticsearch">
- <chmod dir="test-materials/elasticsearch-${elasticsearch.version}" perm="ugo+rxw">
- <fileset dir="**/*"/>
- </chmod>
- <chmod file="test-materials/elasticsearch-${elasticsearch.version}/bin/elasticsearch" perm="ugo+rx"/>
</target>
<target name="download-cleanup">
@@ -82,22 +85,21 @@
</copy>
</target>
- <target name="calculate-testcode-condition">
- <available file="test-materials/elasticsearch-${elasticsearch.version}" property="tests-present"/>
+ <target name="calculate-testcode-condition-unix" if="isUnix">
+ <available file="test-materials/unix/elasticsearch-${elasticsearch.version}" property="tests-present"/>
+ </target>
+
+ <target name="calculate-testcode-condition-windows" if="isWindows">
+ <available file="test-materials/windows/elasticsearch-${elasticsearch.version}" property="tests-present"/>
+ </target>
+
+ <target name="calculate-testcode-condition" depends="calculate-testcode-condition-unix,calculate-testcode-condition-windows">
</target>
<target name="pretest-warn" depends="calculate-testcode-condition" unless="tests-present">
<echo message="Need ElasticSearch download in order to compile tests - run ant make-deps"/>
</target>
- <path id="connector-test-classpath">
- <path refid="mcf-connector-build.connector-test-classpath"/>
- <fileset dir="test-materials/elasticsearch-${elasticsearch.version}">
- <include name="lib/*.jar"/>
- <include name="plugins/mapper-attachments/*.jar"/>
- </fileset>
- </path>
-
<target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
<antcall target="general-add-output-connector">
<param name="connector-label" value="ElasticSearch"/>
Modified: manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseITHSQLDB.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseITHSQLDB.java?rev=1877320&r1=1877319&r2=1877320&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseITHSQLDB.java (original)
+++ manifoldcf/branches/CONNECTORS-1639/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseITHSQLDB.java Sun May 3 11:56:07 2020
@@ -86,10 +86,10 @@ public class BaseITHSQLDB extends org.ap
pb.directory(absFile);
if (isUnix) {
- pb.command("bash", "-c", "../test-materials/elasticsearch-7.6.2/bin/elasticsearch -q");
+ pb.command("bash", "-c", "../test-materials/unix/elasticsearch-7.6.2/bin/elasticsearch -q");
System.out.println("Unix process");
} else {
- pb.command("cmd.exe", "..\\test-materials\\elasticsearch-7.6.2\\bin\\elasticsearch.bat -q");
+ pb.command("cmd.exe", "/c", "..\\test-materials\\windows\\elasticsearch-7.6.2\\bin\\elasticsearch.bat -q");
System.out.println("Windows process");
}