make/conf/jib-profiles.js

rev 51977 : [mq]: 8211350-no-jprt

*** 523,534 ****
              var maketestName = name + "-testmake";
              profiles[maketestName] = concatObjects(profiles[name], testmakeBase);
              profiles[maketestName].default_make_targets = [ "test-make" ];
          });
  
!     // Profiles for building the zero jvm variant. These are used for verification
!     // in JPRT.
      var zeroProfiles = {
          "linux-x64-zero": {
              target_os: "linux",
              target_cpu: "x64",
              dependencies: ["devkit"],
--- 523,533 ----
              var maketestName = name + "-testmake";
              profiles[maketestName] = concatObjects(profiles[name], testmakeBase);
              profiles[maketestName].default_make_targets = [ "test-make" ];
          });
  
!     // Profiles for building the zero jvm variant. These are used for verification.
      var zeroProfiles = {
          "linux-x64-zero": {
              target_os: "linux",
              target_cpu: "x64",
              dependencies: ["devkit"],
*** 731,752 ****
              // Do not inherit artifact definitions from base profile
              delete profiles[cmpBaselineName].artifacts;
          });
      });
  
!     // Profiles used to run tests. Used in JPRT and Mach 5.
      var testOnlyProfiles = {
-         "run-test-jprt": {
-             target_os: input.build_os,
-             target_cpu: input.build_cpu,
-             dependencies: [ "jtreg", "gnumake", "boot_jdk", "devkit", "jib" ],
-             labels: "test",
-             environment: {
-                 "JT_JAVA": common.boot_jdk_home
-             }
-         },
- 
          "run-test": {
              target_os: input.build_os,
              target_cpu: input.build_cpu,
              dependencies: [ "jtreg", "gnumake", "boot_jdk", "devkit", "jib" ],
              labels: "test",
--- 730,741 ----
              // Do not inherit artifact definitions from base profile
              delete profiles[cmpBaselineName].artifacts;
          });
      });
  
!     // Profiles used to run tests.
      var testOnlyProfiles = {
          "run-test": {
              target_os: input.build_os,
              target_cpu: input.build_cpu,
              dependencies: [ "jtreg", "gnumake", "boot_jdk", "devkit", "jib" ],
              labels: "test",
*** 804,814 ****
              dependencies: [ "devkit" ],
              environment_path: input.get("devkit", "install_path")
                  + "/Xcode.app/Contents/Developer/usr/bin"
          };
          profiles["run-test"] = concatObjects(profiles["run-test"], macosxRunTestExtra);
-         profiles["run-test-jprt"] = concatObjects(profiles["run-test-jprt"], macosxRunTestExtra);
          profiles["run-test-prebuilt"] = concatObjects(profiles["run-test-prebuilt"], macosxRunTestExtra);
      }
      // On windows we want the debug symbols available at test time
      if (input.build_os == "windows") {
          windowsRunTestPrebuiltExtra = {
--- 793,802 ----