235 "linux-arm64", "linux-arm-vfp-hflt", "linux-arm-vfp-hflt-dyn" |
235 "linux-arm64", "linux-arm-vfp-hflt", "linux-arm-vfp-hflt-dyn" |
236 ]; |
236 ]; |
237 |
237 |
238 // These are the base setttings for all the main build profiles. |
238 // These are the base setttings for all the main build profiles. |
239 common.main_profile_base = { |
239 common.main_profile_base = { |
240 dependencies: ["boot_jdk", "gnumake", "jtreg"], |
240 dependencies: ["boot_jdk", "gnumake", "jtreg", "jib"], |
241 default_make_targets: ["product-bundles", "test-bundles"], |
241 default_make_targets: ["product-bundles", "test-bundles"], |
242 configure_args: concat(["--enable-jtreg-failure-handler"], |
242 configure_args: concat(["--enable-jtreg-failure-handler"], |
243 versionArgs(input, common)) |
243 versionArgs(input, common)) |
244 }; |
244 }; |
245 // Extra settings for debug profiles |
245 // Extra settings for debug profiles |
587 // Profiles used to run tests. Used in JPRT and Mach 5. |
587 // Profiles used to run tests. Used in JPRT and Mach 5. |
588 var testOnlyProfiles = { |
588 var testOnlyProfiles = { |
589 "run-test-jprt": { |
589 "run-test-jprt": { |
590 target_os: input.build_os, |
590 target_os: input.build_os, |
591 target_cpu: input.build_cpu, |
591 target_cpu: input.build_cpu, |
592 dependencies: [ "jtreg", "gnumake", "boot_jdk" ], |
592 dependencies: [ "jtreg", "gnumake", "boot_jdk", "devkit", "jib" ], |
593 labels: "test", |
593 labels: "test", |
594 environment: { |
594 environment: { |
595 "JT_JAVA": common.boot_jdk_home |
595 "JT_JAVA": common.boot_jdk_home |
596 } |
596 } |
597 }, |
597 }, |
598 |
598 |
599 "run-test": { |
599 "run-test": { |
600 target_os: input.build_os, |
600 target_os: input.build_os, |
601 target_cpu: input.build_cpu, |
601 target_cpu: input.build_cpu, |
602 dependencies: [ "jtreg", "gnumake", "boot_jdk" ], |
602 dependencies: [ "jtreg", "gnumake", "boot_jdk", "devkit", "jib" ], |
603 labels: "test", |
603 labels: "test", |
604 environment: { |
604 environment: { |
605 "JT_JAVA": common.boot_jdk_home |
605 "JT_JAVA": common.boot_jdk_home |
606 } |
606 } |
607 } |
607 } |
614 testedProfile = input.build_os + "-" + input.build_cpu; |
614 testedProfile = input.build_os + "-" + input.build_cpu; |
615 } |
615 } |
616 var testOnlyProfilesPrebuilt = { |
616 var testOnlyProfilesPrebuilt = { |
617 "run-test-prebuilt": { |
617 "run-test-prebuilt": { |
618 src: "src.conf", |
618 src: "src.conf", |
619 dependencies: [ "jtreg", "gnumake", "boot_jdk", testedProfile + ".jdk", |
619 dependencies: [ "jtreg", "gnumake", "boot_jdk", "jib", testedProfile + ".jdk", |
620 testedProfile + ".test", "src.full" |
620 testedProfile + ".test", "src.full" |
621 ], |
621 ], |
622 work_dir: input.get("src.full", "install_path") + "/test", |
622 work_dir: input.get("src.full", "install_path") + "/test", |
623 environment: { |
623 environment: { |
624 "JT_JAVA": common.boot_jdk_home, |
624 "JT_JAVA": common.boot_jdk_home, |
1017 revision: "1.17.2+1.0", |
1017 revision: "1.17.2+1.0", |
1018 module: "pandoc-" + input.target_platform, |
1018 module: "pandoc-" + input.target_platform, |
1019 configure_args: "PANDOC=" + input.get("pandoc", "install_path") + "/pandoc/pandoc", |
1019 configure_args: "PANDOC=" + input.get("pandoc", "install_path") + "/pandoc/pandoc", |
1020 environment_path: input.get("pandoc", "install_path") + "/pandoc" |
1020 environment_path: input.get("pandoc", "install_path") + "/pandoc" |
1021 }, |
1021 }, |
1022 }; |
1022 // This adds java jib as a dependency for the test artifacts resolver |
|
1023 jib: { |
|
1024 organization: "com.oracle.java.jib", |
|
1025 ext: "zip", |
|
1026 classifier: "distribution", |
|
1027 revision: "3.0-SNAPSHOT", |
|
1028 environment_name: "JIB_JAR", |
|
1029 environment_value: input.get("jib", "install_path") |
|
1030 + "/jib-3.0-SNAPSHOT-distribution/lib/jib-3.0-SNAPSHOT.jar" |
|
1031 } |
|
1032 }; |
|
1033 |
|
1034 // Need to add a value for the Visual Studio tools variable to make |
|
1035 // jaot be able to pick up the Visual Studio linker in testing. |
|
1036 if (input.target_os == "windows") { |
|
1037 dependencies.devkit.environment = { |
|
1038 VS120COMNTOOLS: input.get("devkit", "install_path") + "/Common7/Tools" |
|
1039 }; |
|
1040 } |
1023 |
1041 |
1024 return dependencies; |
1042 return dependencies; |
1025 }; |
1043 }; |
1026 |
1044 |
1027 /** |
1045 /** |