diff options
| author | J. Duke <duke@openjdk.org> | 2021-02-19 16:10:52 -0800 |
|---|---|---|
| committer | J. Duke <duke@openjdk.org> | 2021-02-19 16:10:52 -0800 |
| commit | adc6b6235fcde49f7331b3c0e8fe05b3c651bbe9 (patch) | |
| tree | b6a8c18c59a1fb044aa7bd8123f91bb6d9b99a10 | |
| parent | 614bbcf903fc8bd06f73a558d05f8a0b11676ea5 (diff) | |
| parent | 9d95e752a8eeeccf1238a4e03478eea3288a6ccf (diff) | |
| download | libcore-adc6b6235fcde49f7331b3c0e8fe05b3c651bbe9.tar.gz | |
Merge jdk7u12-b06 hotspot
| -rw-r--r-- | .hgtags-top-repo | 1 | ||||
| -rw-r--r-- | make/jprt.properties | 16 | ||||
| -rw-r--r-- | test/Makefile | 12 |
3 files changed, 15 insertions, 14 deletions
diff --git a/.hgtags-top-repo b/.hgtags-top-repo index e42a9150c77..4e270e68bb9 100644 --- a/.hgtags-top-repo +++ b/.hgtags-top-repo @@ -226,3 +226,4 @@ aaf495a24a9bb996b3955e52edff8d93ff62dc5f jdk7u10-b09 207c000ac697d052f84cde6e782865b209e60239 jdk7u12-b02 a3917db5d568d9805b3c46ce67c39c475cf10e0e jdk7u12-b03 52945b197d7c93d215067034a45e5e9452c67f78 jdk7u12-b04 +eae53fe51e79e04ca28b5790a6ae25d39a06b0ab jdk7u12-b05 diff --git a/make/jprt.properties b/make/jprt.properties index 633108a91c5..2dad7bc4f5f 100644 --- a/make/jprt.properties +++ b/make/jprt.properties @@ -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.make.rule.core.test.targets= \ ${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.make.rule.all.test.targets= \ ${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} diff --git a/test/Makefile b/test/Makefile index 0cdfc35c03f..ddbd079e672 100644 --- a/test/Makefile +++ b/test/Makefile @@ -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_TEST_LIST = \ 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 |