make/conf/jib-profiles.js

*** 758,781 ****
      // Profiles used to run tests using Jib for internal dependencies.
      var testedProfile = input.testedProfile;
      if (testedProfile == null) {
          testedProfile = input.build_os + "-" + input.build_cpu;
      }
      var testOnlyProfilesPrebuilt = {
          "run-test-prebuilt": {
              target_os: input.build_os,
              target_cpu: input.build_cpu,
              dependencies: [
!                 "jtreg", "gnumake", "boot_jdk", "devkit", "jib", testedProfile + ".jdk",
!                 testedProfile + ".test"
              ],
              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(testedProfile + ".jdk", "home_path"),
!                 "TEST_IMAGE_DIR": input.get(testedProfile + ".test", "home_path")
              },
              labels: "test"
          }
      };
  
--- 758,788 ----
      // Profiles used to run tests using Jib for internal dependencies.
      var testedProfile = input.testedProfile;
      if (testedProfile == null) {
          testedProfile = input.build_os + "-" + input.build_cpu;
      }
+     var testedProfileJDK = testedProfile + ".jdk";
+     var testedProfileTest = ""
+     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")
              },
              labels: "test"
          }
      };
  
*** 937,946 ****
--- 944,954 ----
              server: "jpg",
              product: "jcov",
              version: "3.0",
              build_number: "b07",
              file: "bundles/jcov-3_0.zip",
+             environment_name: "JCOV_HOME",
          },
  
          gnumake: {
              organization: common.organization,
              ext: "tar.gz",