details:   https://code.openbravo.com/erp/devel/pi/rev/759dcd28bd8d
changeset: 35218:759dcd28bd8d
user:      Javier Armendáriz <javier.armendariz <at> openbravo.com>
date:      Wed Dec 05 14:01:00 2018 +0100
summary:   Fixed issue 39764: Log format changes during build after running 
run.all.tests.

In build tasks, all .xml files found in src-test/src are copied to 
build/classes.
Now the only xml file available in this location is log4j2-test, so there is no
need to perform this task before running tests.

diffstat:

 src-test/build.xml |  17 ++++++-----------
 1 files changed, 6 insertions(+), 11 deletions(-)

diffs (60 lines):

diff -r 7e4c318ad6a3 -r 759dcd28bd8d src-test/build.xml
--- a/src-test/build.xml        Tue Dec 11 15:37:30 2018 +0100
+++ b/src-test/build.xml        Wed Dec 05 14:01:00 2018 +0100
@@ -56,6 +56,7 @@
     <fileset dir="${base.modules}">
       <include name="*/lib/**" />
     </fileset>
+    <pathelement path="${base.src.test}/src"/>
   </path>
 
   <target name="compile.test" depends="sqlc,generate.entities.quick">
@@ -66,20 +67,14 @@
     </javac>
   </target>
 
-  <target name="copy.xml">
-    <copy todir="${build}">
-      <fileset dir="${base.src.test}/src" includes="**/*.xml" />
-    </copy>
-  </target>
-
-  <target name="run.tests" depends="compile.test, copy.xml">
+  <target name="run.tests" depends="compile.test">
     <junit printsummary="no" haltonfailure="yes" showoutput="yes" 
outputtoformatters="false">
       <classpath refid="test.class.path" />
       <test name="org.openbravo.test.AntTaskTests" haltonfailure="no"/>
     </junit>
   </target>
 
-  <target name="run.all.tests" depends="compile.test, copy.xml">
+  <target name="run.all.tests" depends="compile.test">
     <junit printsummary="no" haltonfailure="yes" showoutput="yes" 
outputtoformatters="false">
       <classpath refid="test.class.path" />
       <test name="org.openbravo.test.AllAntTaskTests" haltonfailure="no" 
outfile="../src/result">
@@ -88,14 +83,14 @@
     </junit>
   </target>
 
-  <target name="run.quick.tests" depends="compile.test, copy.xml">
+  <target name="run.quick.tests" depends="compile.test">
     <junit printsummary="no" haltonfailure="yes" showoutput="yes" 
outputtoformatters="false">
       <classpath refid="test.class.path" />
       <test name="org.openbravo.test.AllQuickAntTaskTests" haltonfailure="no"/>
     </junit>
   </target>
 
-  <target name="run.test" depends="compile.test, copy.xml">
+  <target name="run.test" depends="compile.test">
     <junit printsummary="no" haltonfailure="yes" showoutput="yes" 
outputtoformatters="false">
       <classpath refid="test.class.path" />
       <test name="${test}" haltonfailure="no" outfile="../src/result-${test}">
@@ -104,7 +99,7 @@
     </junit>
   </target>
 
-  <target name="run.webservice.tests" depends="compile.test, copy.xml">
+  <target name="run.webservice.tests" depends="compile.test">
     <junit printsummary="no" haltonfailure="yes" showoutput="yes" 
outputtoformatters="false">
       <classpath refid="test.class.path" />
       <test name="org.openbravo.test.AllWebserviceTests" haltonfailure="no" 
outfile="../src/resultws">


_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to