Fix cobertura-report when source has been generated(aka, when javacc or

jjtree has been used). git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1605838 13f79535-47bb-0310-9956-ffa450edef68
apache · Jun 26, 2014 · 3cf4528 · 3cf4528
1 parent c28f6d0
commit 3cf4528
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/common.xml b/common.xml
@@ -129,6 +129,10 @@ under the License.
         <run-junit/>
     </target>
 
+    <patternset id="cobertura-src-dirs">
+        <include name="src"/>
+    </patternset>
+
     <target name="tests-cobertura" depends="jar">
         <mkdir dir="${build.dir}/cobertura-lib"/>
         <taskdef resource="tasks.properties" classpathref="cobertura.class.path"/>
@@ -143,8 +147,7 @@ under the License.
         <mkdir dir="${build.dir}/test-results/cobertura-report"/>
         <cobertura-report datafile="${build.dir}/test-results/cobertura.dat" destdir="${build.dir}/test-results/cobertura-report">
             <dirset dir=".">
-                <patternset refid="src-dirs"/>
-                <include name="src"/>
+                <patternset refid="cobertura-src-dirs"/>
             </dirset>
 
             <include name="**/*.java"/>

diff --git a/framework/base/build.xml b/framework/base/build.xml
@@ -60,6 +60,11 @@ under the License.
         <file name="org/ofbiz/base/concurrent/test/TTLCachedObjectTest.java"/>
     </filelist>
 
+    <patternset id="cobertura-src-dirs">
+        <include name="build/gen-src"/>
+        <include name="src"/>
+    </patternset>
+
     <target name="init">
         <!-- make sure we have crypto packages available -->
         <condition property="exclude.crypto" value="org/ofbiz/base/crypto/**">

diff --git a/framework/sql/build.xml b/framework/sql/build.xml
@@ -47,6 +47,11 @@ under the License.
         <file name="org/ofbiz/sql/test/SelectTest.java"/>
         <file name="org/ofbiz/sql/test/SQLTest.java"/>
     </filelist>
+    <patternset id="cobertura-src-dirs">
+        <include name="build/gen-src/javacc"/>
+        <include name="build/gen-src/jjtree"/>
+        <include name="src"/>
+    </patternset>
 
     <!-- ================================================================== -->
     <!-- Compilation of the source files                                                                                                                         -->