royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [royale-compiler] 03/03: fix ant build after changing test working dir to the project dir
Date Wed, 29 Nov 2017 05:04:46 GMT
This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch feature/rename
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git

commit d2d037b1088fc79f6d684108285695ccd098a510
Author: Alex Harui <aharui@apache.org>
AuthorDate: Tue Nov 28 20:41:33 2017 -0800

    fix ant build after changing test working dir to the project dir
---
 compiler-externc/src/test/build.xml                         |  9 +++++++--
 compiler-jx/src/test/build.xml                              | 13 +++++++++----
 .../main/java/org/apache/royale/utils/AntTestAdapter.java   |  2 +-
 compiler/src/test/build.xml                                 | 10 ++++++++--
 4 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/compiler-externc/src/test/build.xml b/compiler-externc/src/test/build.xml
index 0ea3696..38d0b62 100644
--- a/compiler-externc/src/test/build.xml
+++ b/compiler-externc/src/test/build.xml
@@ -50,6 +50,11 @@
     <target name="compile.unit.tests">
     	<delete dir="${compiler.externc}/target/test-classes"/>
         <mkdir dir="${compiler.externc}/target/test-classes"/>
+        <copy todir="${compiler.externc}/target">
+            <fileset dir="${externc.tests}/resources">
+                <include name="**"/>
+            </fileset>
+        </copy>
         <javac debug="${javac.debug}" deprecation="${javac.deprecation}"
 			   encoding="UTF-8"
 			   destdir="${compiler.externc}/target/test-classes" includeAntRuntime="true">
@@ -67,7 +72,7 @@
         <mkdir dir="${externc.tests}/results"/>
         <mkdir dir="${compiler.externc}/target/junit-temp"/>
         <mkdir dir="${compiler.externc}/target/junit-results"/>
-        <junit dir="${externc.tests}"
+        <junit dir="${compiler.externc}"
             fork="yes" forkMode="perBatch" maxmemory="${maxmem}m" timeout="${test.timeout}"
             printsummary="true" showoutput="true"
             haltonerror="true" haltonfailure="true"
@@ -105,7 +110,7 @@
         <mkdir dir="${externc.tests}/results"/>
         <mkdir dir="${compiler.externc}/target/junit-temp"/>
         <mkdir dir="${compiler.externc}/target/junit-results"/>
-        <junit dir="${externc.tests}"
+        <junit dir="${compiler.externc}"
             fork="yes" forkMode="perBatch" maxmemory="${maxmem}m" timeout="${test.timeout}"
             printsummary="true" showoutput="true"
             haltonerror="true" haltonfailure="true"
diff --git a/compiler-jx/src/test/build.xml b/compiler-jx/src/test/build.xml
index ed942d8..7191442 100644
--- a/compiler-jx/src/test/build.xml
+++ b/compiler-jx/src/test/build.xml
@@ -40,6 +40,11 @@
     <target name="compile.unit.tests">
     	<delete dir="${compiler}/target/test-classes"/>
         <mkdir dir="${compiler}/target/test-classes"/>
+        <copy todir="${compiler}/target">
+            <fileset dir="${compiler.tests}/resources">
+                <include name="**"/>
+            </fileset>
+        </copy>
         <javac debug="${javac.debug}" deprecation="${javac.deprecation}"
 			   encoding="UTF-8"
 			   destdir="${compiler}/target/test-classes" includeAntRuntime="true">
@@ -58,7 +63,7 @@
         <mkdir dir="${compiler}/target/junit-results"/>
         <delete dir="${compiler}/target/junit-temp"/>
         <mkdir dir="${compiler}/target/junit-temp"/>
-        <junit dir="${compiler.tests}"
+        <junit dir="${compiler}"
                fork="yes" forkMode="perBatch" maxmemory="${maxmem}m" timeout="${test.timeout}"
                printsummary="true" showoutput="true"
                haltonerror="true" haltonfailure="true"
@@ -92,7 +97,7 @@
     <target name="integration.tests.asjs" depends="download, compile.unit.tests">
         <mkdir dir="${compiler.tests}/results"/>
         <mkdir dir="${compiler}/target/junit-temp"/>
-        <junit dir="${compiler.tests}"
+        <junit dir="${compiler}"
             fork="yes" forkMode="perBatch" maxmemory="${maxmem}m" timeout="${test.timeout}"
             printsummary="true" showoutput="true"
             haltonerror="true" haltonfailure="true"
@@ -123,7 +128,7 @@
     <target name="integration.tests" depends="download, compile.unit.tests">
         <mkdir dir="${compiler.tests}/results"/>
         <mkdir dir="${compiler}/target/junit-temp"/>
-        <junit dir="${compiler.tests}"
+        <junit dir="${compiler}"
             fork="yes" forkMode="perBatch" maxmemory="${maxmem}m" timeout="${test.timeout}"
             printsummary="true" showoutput="true"
             haltonerror="true" haltonfailure="true"
@@ -151,7 +156,7 @@
     <target name="typedef.tests" depends="download, compile.unit.tests">
         <mkdir dir="${compiler.tests}/results"/>
         <mkdir dir="${compiler}/target/junit-temp"/>
-        <junit dir="${compiler.tests}"
+        <junit dir="${compiler}"
             fork="yes" forkMode="perBatch" maxmemory="${maxmem}m" timeout="${test.timeout}"
             printsummary="true" showoutput="true"
             haltonerror="true" haltonfailure="true"
diff --git a/compiler-test-utils/src/main/java/org/apache/royale/utils/AntTestAdapter.java
b/compiler-test-utils/src/main/java/org/apache/royale/utils/AntTestAdapter.java
index 363b4af..e650836 100644
--- a/compiler-test-utils/src/main/java/org/apache/royale/utils/AntTestAdapter.java
+++ b/compiler-test-utils/src/main/java/org/apache/royale/utils/AntTestAdapter.java
@@ -109,7 +109,7 @@ public class AntTestAdapter implements ITestAdapter {
 
     @Override
     public File getUnitTestBaseDir() {
-        return new File("resources");
+        return new File("target");
     }
 
     private File getLib(String artifactId) {
diff --git a/compiler/src/test/build.xml b/compiler/src/test/build.xml
index 542375b..0957a48 100644
--- a/compiler/src/test/build.xml
+++ b/compiler/src/test/build.xml
@@ -278,6 +278,11 @@
         <echo>compiler is ${compiler} royale is ${royale}</echo>
         <delete dir="${compiler}/target/test-classes"/>
         <mkdir dir="${compiler}/target/test-classes"/>
+        <copy todir="${compiler}/target">
+            <fileset dir="${compiler.tests}/resources">
+                <include name="**"/>
+            </fileset>
+        </copy>
         <javac debug="${javac.debug}" deprecation="${javac.deprecation}" destdir="${compiler}/target/test-classes"
includeAntRuntime="true">
             <src path="${compiler.tests}/java"/>
             <compilerarg value="-Xlint:all,-path"/>
@@ -285,6 +290,7 @@
                 <fileset dir="${compiler}/lib/external" includes="**/*.jar"/>
                 <pathelement location="${compiler}/../compiler-build-tools/target/classes"/>
                 <pathelement location="${compiler}/../compiler-test-utils/target/classes"/>
+                <pathelement location="${compiler}/../compiler-externc/target/classes"/>
                 <pathelement location="${royale}/lib/compiler-common.jar"/>
                 <pathelement location="${royale}/lib/compiler.jar"/>
             </classpath>
@@ -294,7 +300,7 @@
     <target name="tests" depends="download, compile.tests">
         <mkdir dir="${compiler}/target/junit-reports"/>
         <mkdir dir="${compiler}/target/junit-temp"/>
-        <junit dir="${compiler.tests}"
+        <junit dir="${compiler}"
             fork="yes" forkMode="perBatch" maxmemory="${maxmem}m" timeout="${test.timeout}"
             printsummary="true" showoutput="true"
             haltonerror="true" haltonfailure="true"
@@ -336,7 +342,7 @@
     <target name="tests.sdk" depends="download, compile.tests">
         <mkdir dir="${compiler}/target/junit-reports"/>
         <mkdir dir="${compiler}/target/junit-temp"/>
-        <junit dir="${compiler.tests}"
+        <junit dir="${compiler}"
             fork="yes" forkMode="perBatch" maxmemory="${maxmem}m" timeout="${test.timeout}"
             printsummary="true" showoutput="true"
             haltonerror="true" haltonfailure="true"

-- 
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <commits@royale.apache.org>.

Mime
View raw message