equal
deleted
inserted
replaced
523 var maketestName = name + "-testmake"; |
523 var maketestName = name + "-testmake"; |
524 profiles[maketestName] = concatObjects(profiles[name], testmakeBase); |
524 profiles[maketestName] = concatObjects(profiles[name], testmakeBase); |
525 profiles[maketestName].default_make_targets = [ "test-make" ]; |
525 profiles[maketestName].default_make_targets = [ "test-make" ]; |
526 }); |
526 }); |
527 |
527 |
528 // Profiles for building the zero jvm variant. These are used for verification |
528 // Profiles for building the zero jvm variant. These are used for verification. |
529 // in JPRT. |
|
530 var zeroProfiles = { |
529 var zeroProfiles = { |
531 "linux-x64-zero": { |
530 "linux-x64-zero": { |
532 target_os: "linux", |
531 target_os: "linux", |
533 target_cpu: "x64", |
532 target_cpu: "x64", |
534 dependencies: ["devkit"], |
533 dependencies: ["devkit"], |
731 // Do not inherit artifact definitions from base profile |
730 // Do not inherit artifact definitions from base profile |
732 delete profiles[cmpBaselineName].artifacts; |
731 delete profiles[cmpBaselineName].artifacts; |
733 }); |
732 }); |
734 }); |
733 }); |
735 |
734 |
736 // Profiles used to run tests. Used in JPRT and Mach 5. |
735 // Profiles used to run tests. |
737 var testOnlyProfiles = { |
736 var testOnlyProfiles = { |
738 "run-test-jprt": { |
|
739 target_os: input.build_os, |
|
740 target_cpu: input.build_cpu, |
|
741 dependencies: [ "jtreg", "gnumake", "boot_jdk", "devkit", "jib" ], |
|
742 labels: "test", |
|
743 environment: { |
|
744 "JT_JAVA": common.boot_jdk_home |
|
745 } |
|
746 }, |
|
747 |
|
748 "run-test": { |
737 "run-test": { |
749 target_os: input.build_os, |
738 target_os: input.build_os, |
750 target_cpu: input.build_cpu, |
739 target_cpu: input.build_cpu, |
751 dependencies: [ "jtreg", "gnumake", "boot_jdk", "devkit", "jib" ], |
740 dependencies: [ "jtreg", "gnumake", "boot_jdk", "devkit", "jib" ], |
752 labels: "test", |
741 labels: "test", |
804 dependencies: [ "devkit" ], |
793 dependencies: [ "devkit" ], |
805 environment_path: input.get("devkit", "install_path") |
794 environment_path: input.get("devkit", "install_path") |
806 + "/Xcode.app/Contents/Developer/usr/bin" |
795 + "/Xcode.app/Contents/Developer/usr/bin" |
807 }; |
796 }; |
808 profiles["run-test"] = concatObjects(profiles["run-test"], macosxRunTestExtra); |
797 profiles["run-test"] = concatObjects(profiles["run-test"], macosxRunTestExtra); |
809 profiles["run-test-jprt"] = concatObjects(profiles["run-test-jprt"], macosxRunTestExtra); |
|
810 profiles["run-test-prebuilt"] = concatObjects(profiles["run-test-prebuilt"], macosxRunTestExtra); |
798 profiles["run-test-prebuilt"] = concatObjects(profiles["run-test-prebuilt"], macosxRunTestExtra); |
811 } |
799 } |
812 // On windows we want the debug symbols available at test time |
800 // On windows we want the debug symbols available at test time |
813 if (input.build_os == "windows") { |
801 if (input.build_os == "windows") { |
814 windowsRunTestPrebuiltExtra = { |
802 windowsRunTestPrebuiltExtra = { |