Mercurial > hg > icedtea9-forest
changeset 489:661c9aae602b jdk8-b43
Merge
author | katleman |
---|---|
date | Wed, 13 Jun 2012 16:53:05 -0700 |
parents | 6aea9b1a3840 (diff) c61921f9b965 (current diff) |
children | 02c6c67c1bb7 8fb4cd2f05a1 |
files | |
diffstat | 2 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Jun 08 17:28:54 2012 -0700 +++ b/.hgtags Wed Jun 13 16:53:05 2012 -0700 @@ -163,3 +163,4 @@ 8927dd68aee3fa54a1a698e2980e1b2f6c7c12c1 jdk8-b39 a2b2d435f1d275fa8010774c653197c64e326d3a jdk8-b40 1a8c7c530f8a9b7f5bdb9b0693b2f5435ca5205e jdk8-b41 +1ce5dc16416611c58b7480ca67a2eee5153498a6 jdk8-b42
--- a/make/jprt.properties Fri Jun 08 17:28:54 2012 -0700 +++ b/make/jprt.properties Wed Jun 13 16:53:05 2012 -0700 @@ -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)