From 22ea7d377e9d6e69d912c26bbcf6294f93c13355 Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Thu, 4 Feb 2021 14:58:03 +0100
Subject: [PATCH] fix jacoco again
---
.gitlab-ci.yml | 2 +-
.../eraser.java-common-conventions.gradle | 1 -
print-coverage.py | 18 +++++++++++++-----
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dff94011..a4809bd6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ variables:
GRADLE_OPTS: "-Dorg.gradle.daemon=false"
TEST_REPORTS: "eraser-base/build/reports/tests/"
TEST_LOG: "eraser-base/logs/eraser-test.log"
- JACOCO_REPORT: "*/build/reports/jacoco/all-tests/jacocoTestReport.xml"
+ JACOCO_REPORT: "*/build/reports/jacoco/all-tests/jacoco*Report.xml"
# settings for influxdb
INFLUXDB_DB: "jastaddHistory"
INFLUXDB_USER: "root"
diff --git a/buildSrc/src/main/groovy/eraser.java-common-conventions.gradle b/buildSrc/src/main/groovy/eraser.java-common-conventions.gradle
index d74d31f0..35d106e2 100644
--- a/buildSrc/src/main/groovy/eraser.java-common-conventions.gradle
+++ b/buildSrc/src/main/groovy/eraser.java-common-conventions.gradle
@@ -28,7 +28,6 @@ task allTests(type: Test, dependsOn: testClasses) {
group = 'verification'
useJUnitPlatform {
- includeTags 'mqtt | influx'
}
}
diff --git a/print-coverage.py b/print-coverage.py
index 30ee8679..951043a8 100644
--- a/print-coverage.py
+++ b/print-coverage.py
@@ -1,8 +1,16 @@
+import glob
import os
import untangle
-print('Current path: ' + os.path.abspath(os.curdir))
-obj = untangle.parse('eraser-base/build/reports/jacoco/test/jacocoTestReport.xml')
-instructions = [o for o in obj.report.counter if o['type'] == 'INSTRUCTION'][0]
-missed, covered = int(instructions['missed']), int(instructions['covered'])
+
+print(f'Current path: {os.path.abspath(os.curdir)}')
+missed, covered = 0, 0
+for f in glob.iglob(os.getenv('JACOCO_REPORT')):
+ print(f'Checking {f}')
+ obj = untangle.parse(f)
+ instructions = [o for o in obj.report.counter if o['type'] == 'INSTRUCTION'][0]
+ missed += int(instructions['missed'])
+ covered += int(instructions['covered'])
# print missed / (missed + covered)
-print('Covered %.2f%% of instructions for all projects.' % (missed * 100.0 / (missed + covered)))
+if missed == covered == 0:
+ covered = 1
+print('Covered %.2f%% of instructions for all projects.' % (covered * 100.0 / (missed + covered)))
--
GitLab