make/conf/jib-profiles.js

rev 53836 : 8219395: integrate gcov w/ run-test
Reviewed-by: duke

*** 519,528 ****
--- 519,536 ----
              var maketestName = name + "-testmake";
              profiles[maketestName] = concatObjects(profiles[name], testmakeBase);
              profiles[maketestName].default_make_targets = [ "test-make" ];
          });
  
+     // Generate -gcov profiles
+     [ "linux-x64", "macosx-x64" ].forEach(function (name) {
+         var gcovName = name + "-gcov";
+         profiles[gcovName] = clone(profiles[name]);
+         profiles[gcovName].configure_args = concat(profiles[gcovName].configure_args,
+             ["--enable-native-coverage", "--disable-warnings-as-errors"]);
+     });
+ 
      // Profiles for building the zero jvm variant. These are used for verification.
      var zeroProfiles = {
          "linux-x64-zero": {
              target_os: "linux",
              target_cpu: "x64",
*** 770,779 ****
--- 778,824 ----
                      exploded: "images/jdk-jcov"
                  }
              };
          });
  
+     // Artifacts of gcov (native-code-coverage) profiles
+     [ "linux-x64", "macosx-x64" ].forEach(function (name) {
+         var o = artifactData[name]
+         var pf = o.platform
+         var jdk_subdir = (o.jdk_subdir != null ? o.jdk_subdir : "jdk-" + data.version);
+         var jdk_suffix = (o.jdk_suffix != null ? o.jdk_suffix : "tar.gz");
+         var gcovName = name + "-gcov";
+         profiles[gcovName].artifacts = {
+             jdk: {
+                 local: "bundles/\\(jdk.*bin." + jdk_suffix + "\\)",
+                 remote: [
+                     "bundles/" + pf + "/jdk-" + data.version + "_" + pf + "_bin-gcov." + jdk_suffix,
+                     // "bundles/" + pf + "/\\1"
+                 ],
+                 subdir: jdk_subdir,
+                 exploded: "images/jdk",
+             },
+             test: {
+                     local: "bundles/\\(jdk.*bin-tests.tar.gz\\)",
+                     remote: [
+                         "bundles/" + pf + "/jdk-" + data.version + "_" + pf + "_bin-gcov-tests.tar.gz",
+                         // "bundles/" + pf + "/\\1"
+                     ],
+                     exploded: "images/test"
+             },
+             jdk_symbols: {
+                     local: "bundles/\\(jdk.*bin-symbols.tar.gz\\)",
+                     remote: [
+                         "bundles/" + pf + "/jdk-" + data.version + "_" + pf + "_bin-gcov-symbols.tar.gz",
+                         // "bundles/" + pf + "/\\1"
+                     ],
+                     subdir: jdk_subdir,
+                     exploded: "images/jdk"
+                 },
+             };
+     });
+ 
      // Profiles used to run tests.
      var testOnlyProfiles = {
          "run-test": {
              target_os: input.build_os,
              target_cpu: input.build_cpu,
*** 796,815 ****
      if (testedProfile.endsWith("-jcov")) {
          testedProfileTest = testedProfile.substring(0, testedProfile.length - "-jcov".length) + ".test";
      } else {
          testedProfileTest = testedProfile + ".test";
      }
      var testOnlyProfilesPrebuilt = {
          "run-test-prebuilt": {
              target_os: input.build_os,
              target_cpu: input.build_cpu,
              dependencies: [
                  "jtreg", "gnumake", "boot_jdk", "devkit", "jib", "jcov", testedProfileJDK,
                  testedProfileTest
              ],
              src: "src.conf",
!             make_args: [ "run-test-prebuilt", "LOG_CMDLINES=true", "JTREG_VERBOSE=fail,error,time" ],
              environment: {
                  "BOOT_JDK": common.boot_jdk_home,
                  "JDK_IMAGE_DIR": input.get(testedProfileJDK, "home_path"),
                  "TEST_IMAGE_DIR": input.get(testedProfileTest, "home_path")
              },
--- 841,864 ----
      if (testedProfile.endsWith("-jcov")) {
          testedProfileTest = testedProfile.substring(0, testedProfile.length - "-jcov".length) + ".test";
      } else {
          testedProfileTest = testedProfile + ".test";
      }
+     var testOnlyMake = [ "run-test-prebuilt", "LOG_CMDLINES=true", "JTREG_VERBOSE=fail,error,time" ];
+     if (testedProfile.endsWith("-gcov")) {
+         testOnlyMake = concat(testOnlyMake, "GCOV_ENABLED=true")
+     }
      var testOnlyProfilesPrebuilt = {
          "run-test-prebuilt": {
              target_os: input.build_os,
              target_cpu: input.build_cpu,
              dependencies: [
                  "jtreg", "gnumake", "boot_jdk", "devkit", "jib", "jcov", testedProfileJDK,
                  testedProfileTest
              ],
              src: "src.conf",
!             make_args: testOnlyMake,
              environment: {
                  "BOOT_JDK": common.boot_jdk_home,
                  "JDK_IMAGE_DIR": input.get(testedProfileJDK, "home_path"),
                  "TEST_IMAGE_DIR": input.get(testedProfileTest, "home_path")
              },