Merge pull request #149 from IQSS/67_jacoco_cli

#67 merge jacoco.exec files, generate report from result
IQSS · Feb 21, 2020 · 3d88310 · 3d88310
2 parents e259a10 + ab5a7df
commit 3d88310
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/tasks/dataverse-glassfish.yml b/tasks/dataverse-glassfish.yml
@@ -82,16 +82,16 @@
         owner=root group=root mode=0644
   when: ansible_os_family == "RedHat"
 
-- name: place jarfile
+- name: agent must be on glassfish classpath
   copy:
     src: '{{ dataverse.jacoco.home }}/lib/jacocoagent.jar'
     dest: '{{ dataverse.glassfish.root }}/{{ dataverse.glassfish.dir }}/glassfish/lib/jacocoagent.jar'
   when: dataverse.jacoco.enabled == true
 
-- name: name java agent
+- name: configure jacoco agent
   lineinfile:
     path: '{{ glassfish_dir }}/glassfish/domains/{{ dataverse.glassfish.domain }}/config/domain.xml'
-    line: '        <jvm-options>-Djavaagent:{{ dataverse.glassfish.root }}/{{ glassfish_dir }}/glassfish/lib/jacocoagent.jar</jvm-options>'
+    line: '        <jvm-options>-Djavaagent:{{ dataverse.glassfish.root }}/{{ dataverse.glassfish.dir }}/glassfish/lib/jacocoagent.jar'
     insertafter: 'dataverse.timerServer'
   when: dataverse.jacoco.enabled == true
 

diff --git a/tasks/jacoco-generate_report.yml b/tasks/jacoco-generate_report.yml
@@ -11,7 +11,12 @@
     group: '{{ dataverse.glassfish.group }}'
     mode: '0755'
 
+- name: merge jacoco exec files
+  shell: 'java -jar {{ dataverse.jacoco.home }}/lib/jacococli.jar merge {{ glassfish_dir }}/glassfish/domains/{{ dataverse.glassfish.domain }}/config/jacoco.exec {{ dataverse.srcdir }}/target/jacoco.exec --destfile {{ dataverse.srcdir }}/target/jacoco_merged.exec'
+  args:
+    chdir: '{{ jacoco.home }}'
+
 - name: create code coverage report
-  shell: 'java -jar /tmp/jacoco/lib/jacococli.jar report --classfiles target/classes --sourcefiles src/main/java --html target/coverage-it/ {{ dataverse.glassfish.root }}/{{ dataverse.glassfish.dir }}/glassfish/domains/{{ dataverse.glassfish.domain }}/config/jacoco.exec'
+  shell: 'java -jar {{ dataverse.jacoco.home }}/lib/jacococli.jar report --classfiles target/classes --sourcefiles src/main/java --html target/coverage-it/ {{ dataverse.srcdir }}/target/jacoco_merged.exec'
   args:
     chdir: '{{ dataverse.srcdir }}'