incubator-asterixdb git commit: Fix Coverage Report

[mb...@apache.org]

Repository: incubator-asterixdb
Updated Branches:
  refs/heads/master 930bc555c -> 7cd7c2d5c


Fix Coverage Report

Fix the coverage report generated by jacoco plugin, broken by the
great merge, to again include hyracks classes / coverage.

Change-Id: I023e4293954aef291358190e20ef3c5225fe87a6
Reviewed-on: https://asterix-gerrit.ics.uci.edu/893
Reviewed-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <ti...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/commit/7cd7c2d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/tree/7cd7c2d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/diff/7cd7c2d5

Branch: refs/heads/master
Commit: 7cd7c2d5c3af74616f77eff155a57b0897eefe35
Parents: 930bc55
Author: Michael Blow <mb...@apache.org>
Authored: Fri May 27 21:01:50 2016 -0400
Committer: Michael Blow <mi...@couchbase.com>
Committed: Fri May 27 21:11:34 2016 -0700

----------------------------------------------------------------------
 asterixdb/asterix-coverage/pom.xml | 40 ++++-----------------------------
 1 file changed, 4 insertions(+), 36 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/7cd7c2d5/asterixdb/asterix-coverage/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-coverage/pom.xml b/asterixdb/asterix-coverage/pom.xml
index 3692fb2..f71f3a2 100644
--- a/asterixdb/asterix-coverage/pom.xml
+++ b/asterixdb/asterix-coverage/pom.xml
@@ -52,35 +52,17 @@
                 <configuration>
                   <target if="coverage" unless="skipTests">
                     <echo message="Generating JaCoCo Reports" />
-                    <property name="asterix.dir" location="${basedir}/.."/>
-                    <!-- special case for jenkins -->
-                    <condition property="hyracks.dir" value="${asterix.dir}/hyracks">
-                      <available file="${asterix.dir}/hyracks/pom.xml"/>
-                    </condition>
-                    <pathconvert property="hyracks.dir">
-                      <first>
-                        <dirset dir="${asterix.dir}/..">
-                          <include name="*hyracks"/>
-                        </dirset>
-                      </first>
-                    </pathconvert>
+                    <property name="asterix.dir" location="${basedir}/../.."/>
+
                     <!-- gather all of the source dirs -->
                     <pathconvert property="source.dirs" pathsep=",">
                       <dirset dir="${asterix.dir}">
                         <include name="**/src/main/java"/>
-                        <!-- special case for jenkins -->
-                        <exclude name="hyracks/**"/>
-                      </dirset>
-                    </pathconvert>
-                    <pathconvert property="hyracks.source.dirs" pathsep=",">
-                      <dirset dir="${hyracks.dir}">
-                        <include name="**/src/main/java"/>
                       </dirset>
                     </pathconvert>
+
                     <echo message="asterix dir: ${asterix.dir}/"/>
-                    <echo message="hyracks dir: ${hyracks.dir}"/>
                     <echo message="asterix source dirs: ${source.dirs}/"/>
-                    <echo message="hyracks source dirs: ${hyracks.source.dirs}/"/>
 
                     <taskdef name="report" classname="org.jacoco.ant.ReportTask">
                       <classpath path="${basedir}/target/jacoco-jars/org.jacoco.ant.jar" />
@@ -97,8 +79,7 @@
                           <classfiles>
                             <fileset dir="${asterix.dir}">
                               <include name="**/target/classes/**/*.class"/>
-                              <!-- special case for jenkins -->
-                              <exclude name="hyracks/**"/>
+                              <exclude name="**/hyracks-hdfs/hyracks-hdfs-1.x/**"/>
                             </fileset>
                           </classfiles>
                           <sourcefiles encoding="UTF-8">
@@ -107,19 +88,6 @@
                             </multirootfileset>
                           </sourcefiles>
                         </group>
-                        <group name="Hyracks">
-                          <classfiles>
-                            <fileset dir="${hyracks.dir}">
-                              <include name="**/target/classes/**/*.class"/>
-                              <exclude name="hyracks/hyracks-hdfs/hyracks-hdfs-1.x/**"/>
-                            </fileset>
-                          </classfiles>
-                          <sourcefiles encoding="UTF-8">
-                            <multirootfileset basedirs="${hyracks.source.dirs}" type="file">
-                              <include name="**/*.java"/>
-                            </multirootfileset>
-                          </sourcefiles>
-                        </group>
                       </structure>
                       <html destdir="${basedir}/target/coverage-report/html" />
                       <xml destfile="${basedir}/target/coverage-report/coverage-report.xml" />