8184075: Make run-test-prebuilt profile more robust
Reviewed-by: tbell
This commit is contained in:
parent
f5d31f8a92
commit
6e805e39a3
@ -615,6 +615,8 @@ var getJibProfilesProfiles = function (input, common, data) {
|
||||
}
|
||||
var testOnlyProfilesPrebuilt = {
|
||||
"run-test-prebuilt": {
|
||||
target_os: input.build_os,
|
||||
target_cpu: input.build_cpu,
|
||||
src: "src.conf",
|
||||
dependencies: [ "jtreg", "gnumake", "boot_jdk", testedProfile + ".jdk",
|
||||
testedProfile + ".test", "src.full"
|
||||
@ -635,13 +637,14 @@ var getJibProfilesProfiles = function (input, common, data) {
|
||||
if (input.profile == "run-test-prebuilt") {
|
||||
if (profiles[testedProfile] == null) {
|
||||
error("testedProfile is not defined: " + testedProfile);
|
||||
} else {
|
||||
testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_os"]
|
||||
= profiles[testedProfile]["target_os"];
|
||||
testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_cpu"]
|
||||
= profiles[testedProfile]["target_cpu"];
|
||||
}
|
||||
}
|
||||
if (profiles[testedProfile] != null) {
|
||||
testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_os"]
|
||||
= profiles[testedProfile]["target_os"];
|
||||
testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_cpu"]
|
||||
= profiles[testedProfile]["target_cpu"];
|
||||
}
|
||||
profiles = concatObjects(profiles, testOnlyProfilesPrebuilt);
|
||||
|
||||
// On macosx add the devkit bin dir to the path in all the run-test profiles.
|
||||
|
Loading…
x
Reference in New Issue
Block a user