Mercurial > hg > openjdk > icedtea > jdk7
changeset 535:0e7b94bd450d icedtea-2.3-branchpoint
Merge jdk7u6-b18
author | andrew |
---|---|
date | Tue, 10 Jul 2012 10:39:16 +0100 |
parents | 7f5ea73378df (current diff) 9c41f7b1460b (diff) |
children | 3f6f086786d1 |
files | .hgtags |
diffstat | 3 files changed, 3 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Jun 29 15:19:51 2012 +0100 +++ b/.hgtags Tue Jul 10 10:39:16 2012 +0100 @@ -196,3 +196,4 @@ eff9ea1ca63df8656ebef9fedca0c647a210d807 jdk7u6-b14 528f1589f5f2adf18d5d21384ba668b9aa79841e jdk7u6-b15 7b77364eb09faac4c37ce9dd2c2308ca5525f18f jdk7u6-b16 +b7c1b441d131c70278de299b5d1e59dce0755dc5 jdk7u6-b17
--- a/make/jprt.properties Fri Jun 29 15:19:51 2012 +0100 +++ b/make/jprt.properties Tue Jul 10 10:39:16 2012 +0100 @@ -91,6 +91,7 @@ ${jprt.my.test.target.set:TESTNAME=jdk_text}, \ ${jprt.my.test.target.set:TESTNAME=jdk_tools1}, \ ${jprt.my.test.target.set:TESTNAME=jdk_tools2}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_jfr}, \ ${jprt.my.test.target.set:TESTNAME=jdk_misc} # All vm test targets (testset=all)