equal
deleted
inserted
replaced
619 testedProfile = input.build_os + "-" + input.build_cpu; |
619 testedProfile = input.build_os + "-" + input.build_cpu; |
620 } |
620 } |
621 var testOnlyProfilesPrebuilt = { |
621 var testOnlyProfilesPrebuilt = { |
622 "run-test-prebuilt": { |
622 "run-test-prebuilt": { |
623 src: "src.conf", |
623 src: "src.conf", |
624 dependencies: [ "jtreg", "gnumake", testedProfile + ".jdk", |
624 dependencies: [ "jtreg", "gnumake", "boot_jdk", testedProfile + ".jdk", |
625 testedProfile + ".test", "src.full" |
625 testedProfile + ".test", "src.full" |
626 ], |
626 ], |
627 work_dir: input.get("src.full", "install_path") + "/test", |
627 work_dir: input.get("src.full", "install_path") + "/test", |
628 environment: { |
628 environment: { |
629 "JT_JAVA": common.boot_jdk_home, |
629 "JT_JAVA": common.boot_jdk_home, |
1146 var version_numbers = getVersionNumbers(); |
1146 var version_numbers = getVersionNumbers(); |
1147 var version = (major != null ? major : version_numbers.get("DEFAULT_VERSION_MAJOR")) |
1147 var version = (major != null ? major : version_numbers.get("DEFAULT_VERSION_MAJOR")) |
1148 + "." + (minor != null ? minor : version_numbers.get("DEFAULT_VERSION_MINOR")) |
1148 + "." + (minor != null ? minor : version_numbers.get("DEFAULT_VERSION_MINOR")) |
1149 + "." + (security != null ? security : version_numbers.get("DEFAULT_VERSION_SECURITY")) |
1149 + "." + (security != null ? security : version_numbers.get("DEFAULT_VERSION_SECURITY")) |
1150 + "." + (patch != null ? patch : version_numbers.get("DEFAULT_VERSION_PATCH")); |
1150 + "." + (patch != null ? patch : version_numbers.get("DEFAULT_VERSION_PATCH")); |
1151 while (version.match(".*\.0$")) { |
1151 while (version.match(".*\\.0$")) { |
1152 version = version.substring(0, version.length - 2); |
1152 version = version.substring(0, version.length - 2); |
1153 } |
1153 } |
1154 return version; |
1154 return version; |
1155 }; |
1155 }; |
1156 |
1156 |