Mercurial > hg > release > icedtea7-forest-2.4
changeset 610:9b35dbaf2afa
Merge jdk7u12-b06
author | andrew |
---|---|
date | Thu, 03 Jan 2013 15:32:34 +0000 |
parents | af7f3ffa51f0 (current diff) c3e42860af1c (diff) |
children | 8a10a3c51f1c |
files | .hgtags |
diffstat | 3 files changed, 17 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Nov 30 12:16:59 2012 +0000 +++ b/.hgtags Thu Jan 03 15:32:34 2013 +0000 @@ -232,3 +232,6 @@ 3eddc50eb3574bf4cff4081310fd763e958ed073 jdk7u12-b01 207c000ac697d052f84cde6e782865b209e60239 jdk7u12-b02 a3917db5d568d9805b3c46ce67c39c475cf10e0e jdk7u12-b03 +52945b197d7c93d215067034a45e5e9452c67f78 jdk7u12-b04 +eae53fe51e79e04ca28b5790a6ae25d39a06b0ab jdk7u12-b05 +a008905ce525b88e5bdc80fe6ad7570f6f6a19ac jdk7u12-b06
--- a/make/jprt.properties Fri Nov 30 12:16:59 2012 +0000 +++ b/make/jprt.properties Thu Jan 03 15:32:34 2013 +0000 @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2012, 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 @@ -79,20 +79,17 @@ ${jprt.my.test.target.set:TESTNAME=jdk_util}, \ ${jprt.my.test.target.set:TESTNAME=jdk_io}, \ ${jprt.my.test.target.set:TESTNAME=jdk_net}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_nio1}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_nio2}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_nio3}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_nio}, \ ${jprt.my.test.target.set:TESTNAME=jdk_security1}, \ ${jprt.my.test.target.set:TESTNAME=jdk_security2}, \ ${jprt.my.test.target.set:TESTNAME=jdk_security3}, \ ${jprt.my.test.target.set:TESTNAME=jdk_rmi}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_management1}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_management2}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_management}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_jmx}, \ ${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_tools}, \ ${jprt.my.test.target.set:TESTNAME=jdk_jfr}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_misc} + ${jprt.my.test.target.set:TESTNAME=jdk_other} # All vm test targets (testset=all) jprt.vm.all.test.targets= \ @@ -107,6 +104,7 @@ ${jprt.my.test.target.set:TESTNAME=jdk_beans1} \ ${jprt.my.test.target.set:TESTNAME=jdk_beans2}, \ ${jprt.my.test.target.set:TESTNAME=jdk_beans3}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_jdi}, \ ${jprt.my.test.target.set:TESTNAME=jdk_sound}, \ ${jprt.my.test.target.set:TESTNAME=jdk_swing}
--- a/test/Makefile Fri Nov 30 12:16:59 2012 +0000 +++ b/test/Makefile Thu Jan 03 15:32:34 2013 +0000 @@ -1,5 +1,5 @@ # -# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 2012, 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 @@ -57,15 +57,17 @@ jdk_beans1 jdk_beans2 jdk_beans3 \ jdk_io \ jdk_lang \ - jdk_management1 jdk_management2 \ + jdk_management \ + jdk_jmx \ jdk_math \ - jdk_misc \ + jdk_other \ jdk_net \ - jdk_nio1 jdk_nio2 jdk_nio3 \ + jdk_nio \ jdk_security1 jdk_security2 jdk_security3 \ jdk_sound \ jdk_text \ - jdk_tools1 jdk_tools2 \ + jdk_tools \ + jdk_jdi \ jdk_jfr \ jdk_util