[GR-29961] Improve compiler code coverage.

PullRequest: graal/8661
xjjdlut · Apr 12, 2021 · 145c843 · 145c843
2 parents 836d28b + f8c003a
commit 145c843
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/compiler/ci_common/gate.hocon b/compiler/ci_common/gate.hocon
@@ -23,7 +23,7 @@ gateCoverage : {
     EXTRA_VM_ARGS : ""
   }
   run : [
-    ${gateCmd} ["build,coverage", --jacocout, html]
+    ${gateCmd} ["build,coverage", --jacoco-omit-excluded, --jacocout, html]
     [mx, coverage-upload]
     # GR-18258 [mx, sonarqube-upload, "-Dsonar.host.url=$SONAR_HOST_URL", "-Dsonar.projectKey=com.oracle.graal.compiler."${jvm-config.default}, "-Dsonar.projectName=GraalVM - Compiler ("${jvm-config.default}")", --exclude-generated, --skip-coverage]
   ]
@@ -82,7 +82,7 @@ gateTestCTWWeekly : {
   run : [
     # At least one gate build should run without strict
     # compliance as that's how Travis runs on JDK9
-    ["mx"] ${gateCmdSuffix} ["build,ctw", "--jacocout", "html"]
+    ["mx"] ${gateCmdSuffix} ["build,ctw", "--jacoco-omit-excluded", "--jacocout", "html"]
     ["mx", "coverage-upload"]
   ]
   timelimit : "1:30:00"

diff --git a/compiler/ci_common/gate_tasks.hocon b/compiler/ci_common/gate_tasks.hocon
@@ -37,6 +37,8 @@ builds += [
   ${gateMathStubsListener}                                                {name: "daily-hotspot-mathstubs-listener"}
 
   # Linux AArch64
-  ${gateTest}           ${labsjdk-ce-11}      ${gateLinuxAArch64} {name: "gate-compiler-test-labsjdk-ce-11-linux-aarch64",                   timelimit: "1:50:00"}
-  ${gateTestCTW}        ${labsjdk-ce-11}      ${gateLinuxAArch64} {name: "gate-compiler-ctw-labsjdk-ce-11-linux-aarch64",                    timelimit: "1:50:00"}
+  ${gateTest}           ${labsjdk-ce-11}      ${gateLinuxAArch64} {name: "gate-compiler-test-labsjdk-ce-11-linux-aarch64",                     timelimit: "1:50:00"}
+  ${gateTestCTW}        ${labsjdk-ce-11}      ${gateLinuxAArch64} {name: "gate-compiler-ctw-labsjdk-ce-11-linux-aarch64",                      timelimit: "1:50:00"}
+  ${gateCoverage}       ${labsjdk-ce-11}      ${gateLinuxAArch64} {name: "weekly-compiler-coverage-11-linux-aarch64"}          ${graalWeekly} {timelimit: "1:50:00"}
+  ${gateTestCTWWeekly}  ${labsjdk-ee-11}      ${gateLinuxAArch64} {name: "weekly-test-compiler-ctw-labsjdk-ee-11-linux-aarch64"} ${graalWeekly}
 ]
diff --git a/compiler/mx.compiler/mx_compiler.py b/compiler/mx.compiler/mx_compiler.py
@@ -147,7 +147,7 @@ def source_supplier():
     _check_jvmci_version(jdk)
 
 mx_gate.add_jacoco_includes(['org.graalvm.*'])
-mx_gate.add_jacoco_excludes(['com.oracle.truffle.*'])
+mx_gate.add_jacoco_excludes(['com.oracle.truffle'])
 mx_gate.add_jacoco_excluded_annotations(['@Snippet', '@ClassSubstitution'])
 
 def _get_XX_option_value(vmargs, name, default):