Merge
This commit is contained in:
commit
e4eaf0bab7
@ -259,3 +259,4 @@ ab55a18a95e1990a588929d5d29db3eb9985fea0 jdk9-b11
|
||||
4e3aa9723e9972623e3dafc321b368e7db7e9b3b jdk9-b14
|
||||
b114474fb25af4e73cb7219f7c04bd8994da03a5 jdk9-b15
|
||||
cf22a728521f91a4692b433d39d730a0a1b23155 jdk9-b16
|
||||
24152ee0ee1abef54a8bab04c099261dba7bcca5 jdk9-b17
|
||||
|
@ -25,7 +25,7 @@
|
||||
|
||||
# Properties for jprt
|
||||
|
||||
# Locked down to jdk8
|
||||
# Locked down to jdk9
|
||||
jprt.tools.default.release=jdk9
|
||||
|
||||
# Unix toolkit to use for building on windows
|
||||
@ -36,8 +36,8 @@ jprt.build.flavors=product,fastdebug
|
||||
|
||||
# Standard list of jprt build targets for this source tree
|
||||
jprt.build.targets= \
|
||||
solaris_sparcv9_5.10-{product|fastdebug}, \
|
||||
solaris_x64_5.10-{product|fastdebug}, \
|
||||
solaris_sparcv9_5.11-{product|fastdebug}, \
|
||||
solaris_x64_5.11-{product|fastdebug}, \
|
||||
linux_i586_2.6-{product|fastdebug}, \
|
||||
linux_x64_2.6-{product|fastdebug}, \
|
||||
macosx_x64_10.7-{product|fastdebug}, \
|
||||
@ -49,8 +49,8 @@ jprt.my.test.set=${jprt.test.set}
|
||||
|
||||
# Test target list (no fastdebug & limited c2 testing)
|
||||
jprt.my.test.target.set= \
|
||||
solaris_sparcv9_5.10-product-c2-TESTNAME, \
|
||||
solaris_x64_5.10-product-c2-TESTNAME, \
|
||||
solaris_sparcv9_5.11-product-c2-TESTNAME, \
|
||||
solaris_x64_5.11-product-c2-TESTNAME, \
|
||||
linux_i586_2.6-product-{c1|c2}-TESTNAME, \
|
||||
linux_x64_2.6-product-c2-TESTNAME, \
|
||||
macosx_x64_10.7-product-c2-TESTNAME, \
|
||||
@ -131,8 +131,8 @@ jprt.make.rule.pit.test.targets= \
|
||||
|
||||
# JCK test targets in test/Makefile (no windows)
|
||||
jprt.my.jck.test.target.set= \
|
||||
solaris_sparcv9_5.10-product-c2-JCK7TESTRULE, \
|
||||
solaris_x64_5.10-product-c2-JCK7TESTRULE, \
|
||||
solaris_sparcv9_5.11-product-c2-JCK7TESTRULE, \
|
||||
solaris_x64_5.11-product-c2-JCK7TESTRULE, \
|
||||
linux_i586_2.6-product-c1-JCK7TESTRULE, \
|
||||
linux_x64_2.6-product-c2-JCK7TESTRULE
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user