提交 6e71444c 编写于 作者: L lana

Merge

...@@ -127,6 +127,11 @@ CORE_PKGS = \ ...@@ -127,6 +127,11 @@ CORE_PKGS = \
java.sql \ java.sql \
java.text \ java.text \
java.text.spi \ java.text.spi \
java.time \
java.time.temporal \
java.time.calendar \
java.time.format \
java.time.zone \
java.util \ java.util \
java.util.concurrent \ java.util.concurrent \
java.util.concurrent.atomic \ java.util.concurrent.atomic \
......
# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
...@@ -269,6 +269,7 @@ COMMON_JAVADOCFLAGS = \ ...@@ -269,6 +269,7 @@ COMMON_JAVADOCFLAGS = \
-quiet \ -quiet \
-use \ -use \
-keywords \ -keywords \
-Xdoclint:none \
$(ADDITIONAL_JAVADOCFLAGS) $(ADDITIONAL_JAVADOCFLAGS)
ifdef OPENJDK ifdef OPENJDK
......
...@@ -92,6 +92,7 @@ jprt.make.rule.core.test.targets= \ ...@@ -92,6 +92,7 @@ jprt.make.rule.core.test.targets= \
${jprt.my.test.target.set:TESTNAME=jdk_text}, \ ${jprt.my.test.target.set:TESTNAME=jdk_text}, \
${jprt.my.test.target.set:TESTNAME=jdk_tools}, \ ${jprt.my.test.target.set:TESTNAME=jdk_tools}, \
${jprt.my.test.target.set:TESTNAME=jdk_jfr}, \ ${jprt.my.test.target.set:TESTNAME=jdk_jfr}, \
${jprt.my.test.target.set:TESTNAME=jdk_time}, \
${jprt.my.test.target.set:TESTNAME=jdk_other} ${jprt.my.test.target.set:TESTNAME=jdk_other}
# All vm test targets (testset=all) # All vm test targets (testset=all)
......
...@@ -63,7 +63,8 @@ JDK_DEFAULT_TEST_LIST = \ ...@@ -63,7 +63,8 @@ JDK_DEFAULT_TEST_LIST = \
jdk_nio \ jdk_nio \
jdk_security1 \ jdk_security1 \
jdk_text \ jdk_text \
jdk_util jdk_util \
jdk_time
# These tests are not part of the default testing list # These tests are not part of the default testing list
JDK_NONDEFAULT_TEST_LIST = \ JDK_NONDEFAULT_TEST_LIST = \
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册