Merge branch 'DDS-2979-split-junit'

build.properties

@@ -14,6 +14,8 @@ inttestsrc.dir=test/integration
 testclasses.dir=dist/testclasses
 testreport.dir=dist/junit-reports
 testhtml.dir=dist/junit-reports/html
+longtestreport.dir=dist/junit-long-reports
+longtesthtml.dir=dist/junit-long-reports/html
 
 ## Contrib
 contrib.root.dir=contrib

build.xml

@@ -389,22 +389,22 @@
   </target>
 
   <target name="junit-long" depends="build, buildtest, junit" description="Run long junit tests that uses larger data sets than normal junit tests.">
-    <replace-dir dir="${testreport.dir}" />
-    <replace-dir dir="${testhtml.dir}" />
+    <replace-dir dir="${longtestreport.dir}" />
+    <replace-dir dir="${longtesthtml.dir}" />
     <junit printsummary="yes" showoutput="true" maxmemory="1024m">
       <classpath refid="test-classpath" />
       <formatter type="xml" />
-      <batchtest fork="yes" todir="${testreport.dir}">
+      <batchtest fork="yes" todir="${longtestreport.dir}">
         <fileset dir="${longtestsrc.dir}">
           <include name="**/*Test.java" />
         </fileset>
       </batchtest>
     </junit>
-    <junitreport todir="${testhtml.dir}">
-      <fileset dir="${testreport.dir}">
+    <junitreport todir="${longtesthtml.dir}">
+      <fileset dir="${longtestreport.dir}">
         <include name="TEST-*.xml" />
       </fileset>
-      <report todir="${testhtml.dir}" format="frames" />
+      <report todir="${longtesthtml.dir}" format="frames" />
     </junitreport>
   </target>