8077524: Enable selective test bundle installation for jprt test targets
Reviewed-by: dholmes
This commit is contained in:
parent
bc9c6072b2
commit
b5264b3449
@ -28,8 +28,8 @@
|
||||
# Global settings
|
||||
#
|
||||
|
||||
# Regression tests depend on test bundle
|
||||
jprt.use.reg.test.bundle=true
|
||||
# Install test bundle for targets in jprt.test.bundle.targets set
|
||||
jprt.selective.test.bundle.installation=true
|
||||
|
||||
# The current release name
|
||||
jprt.tools.default.release=jdk9
|
||||
@ -73,6 +73,7 @@ jprt.build.targets=${my.is.hotspot.job ? ${my.build.targets.hotspot} : ${my.buil
|
||||
# Select test targets - jprt default for jprt.test.set is "default"
|
||||
jprt.test.targets=${my.test.targets.${jprt.test.set}}
|
||||
jprt.make.rule.test.targets=${my.make.rule.test.targets.${jprt.test.set}}
|
||||
jprt.test.bundle.targets=${my.jprt.test.bundle.targets.${jprt.test.set}}
|
||||
|
||||
# 7155453: Work-around to prevent popups on OSX from blocking test completion
|
||||
# but the work-around is added to all platforms to be consistent
|
||||
@ -442,10 +443,8 @@ my.make.rule.test.targets.hotspot.reg.group= \
|
||||
linux_i586_2.6-fastdebug-c1-GROUP, \
|
||||
windows_i586_6.1-fastdebug-c1-GROUP
|
||||
|
||||
my.make.rule.test.targets.hotspot= \
|
||||
${my.make.rule.test.targets.hotspot.clienttests}, \
|
||||
${my.make.rule.test.targets.hotspot.servertests}, \
|
||||
${my.make.rule.test.targets.hotspot.internalvmtests}, \
|
||||
# Hotspot jtreg tests
|
||||
my.make.rule.test.targets.hotspot.reg= \
|
||||
${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_wbapitest}, \
|
||||
${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_1}, \
|
||||
${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_2}, \
|
||||
@ -458,9 +457,28 @@ my.make.rule.test.targets.hotspot= \
|
||||
${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_runtime_closed}, \
|
||||
${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_serviceability}, \
|
||||
${my.make.rule.test.targets.hotspot.reg.group:GROUP=jdk_svc_sanity}, \
|
||||
${my.additional.make.rule.test.targets.hotspot}
|
||||
${my.additional.make.rule.test.targets.hotspot.reg}
|
||||
|
||||
# Other Makefile based Hotspot tests
|
||||
my.make.rule.test.targets.hotspot.other= \
|
||||
${my.make.rule.test.targets.hotspot.clienttests}, \
|
||||
${my.make.rule.test.targets.hotspot.servertests}, \
|
||||
${my.make.rule.test.targets.hotspot.internalvmtests}, \
|
||||
${my.additional.make.rule.test.targets.hotspot.other}
|
||||
|
||||
# All the makefile based tests to run
|
||||
my.make.rule.test.targets.hotspot= \
|
||||
${my.make.rule.test.targets.hotspot.reg} \
|
||||
${my.make.rule.test.targets.hotspot.other}
|
||||
|
||||
# Install the test bundle for the testset hotspot jtreg tests
|
||||
# (but not for the other Makefile based tests)
|
||||
my.jprt.test.bundle.targets.hotspot=${my.make.rule.test.targets.hotspot.reg}
|
||||
|
||||
# Native jdk and hotspot test targets (testset=nativesanity)
|
||||
my.make.rule.test.targets.nativesanity= \
|
||||
${my.test.target.set:TESTNAME=jdk_native_sanity}, \
|
||||
${my.test.target.set:TESTNAME=hotspot_native_sanity}
|
||||
|
||||
# Install the test bundle for the nativesanity jtreg tests
|
||||
my.jprt.test.bundle.targets.nativesanity=${my.make.rule.test.targets.nativesanity}
|
||||
|
Loading…
x
Reference in New Issue
Block a user