Merge
This commit is contained in:
commit
e88ac89a6b
@ -229,3 +229,4 @@ b7e64be81c8a7690703df5711f4fc2375da8a9cb jdk8-b103
|
||||
5166118c59178b5d31001bc4058e92486ee07d9b jdk8-b105
|
||||
8e7b4d9fb00fdf1334376aeac050c9bca6d1b383 jdk8-b106
|
||||
0874bb4707b723d5bb108d379c557cf41529d1a7 jdk8-b107
|
||||
9286a6e61291246d88af713f1ef79adeea30fe2e jdk8-b108
|
||||
|
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
@ -43,8 +43,8 @@ jprt.build.targets= \
|
||||
linux_i586_2.6-{product|fastdebug}, \
|
||||
linux_x64_2.6-{product|fastdebug}, \
|
||||
macosx_x64_10.7-{product|fastdebug}, \
|
||||
windows_i586_5.1-{product|fastdebug}, \
|
||||
windows_x64_5.2-{product|fastdebug}
|
||||
windows_i586_6.1-{product|fastdebug}, \
|
||||
windows_x64_6.1-{product|fastdebug}
|
||||
|
||||
# User can select the test set with jprt submit "-testset name" option
|
||||
jprt.my.test.set=${jprt.test.set}
|
||||
@ -58,8 +58,8 @@ jprt.my.test.target.set= \
|
||||
linux_i586_2.6-product-{c1|c2}-TESTNAME, \
|
||||
linux_x64_2.6-product-c2-TESTNAME, \
|
||||
macosx_x64_10.7-product-c2-TESTNAME, \
|
||||
windows_i586_5.1-product-c1-TESTNAME, \
|
||||
windows_x64_5.2-product-c2-TESTNAME
|
||||
windows_i586_6.1-product-c1-TESTNAME, \
|
||||
windows_x64_6.1-product-c2-TESTNAME
|
||||
|
||||
# Default vm test targets (testset=default)
|
||||
jprt.vm.default.test.targets= \
|
||||
|
Loading…
x
Reference in New Issue
Block a user