diff --git a/make/common/Release.gmk b/make/common/Release.gmk index 391ce2d09fd9c232f4c4bf402f255c163342333e..4bd65a4c8a1a32c28012e84d467f292944eb9d62 100644 --- a/make/common/Release.gmk +++ b/make/common/Release.gmk @@ -55,6 +55,13 @@ EXCLUDE_PROPWARN_PKGS = com.sun.java.swing.plaf \ # This is a stopgap until 6839872 is fixed. EXCLUDE_PROPWARN_PKGS += sun.dyn +# +# Include the exported private packages in ct.sym. +# This is an interim solution until the ct.sym is replaced +# with a new module system (being discussed for JDK 7). +# +EXPORTED_PRIVATE_PKGS = com.sun.servicetag + # 64-bit solaris has a few special cases. We define the variable # SOLARIS64 for use in this Makefile to easily test those cases ifeq ($(PLATFORM), solaris) @@ -981,7 +988,7 @@ initial-image-jdk:: initial-image-jdk-setup \ -processor com.sun.tools.javac.sym.CreateSymbols \ -Acom.sun.tools.javac.sym.Jar=$(RT_JAR) \ -Acom.sun.tools.javac.sym.Dest=$(OUTPUTDIR)/symbols/META-INF/sym/rt.jar \ - $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS) + $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS) $(EXPORTED_PRIVATE_PKGS) $(BOOT_JAR_CMD) c0f $(LIBDIR)/ct.sym \ -C $(OUTPUTDIR)/symbols META-INF $(BOOT_JAR_JFLAGS) @$(java-vm-cleanup) diff --git a/test/ProblemList.txt b/test/ProblemList.txt index d1135dffe42acce599c7130197b5adef68c59eda..3012c9ce3676ee751e2654a05b6034ccff6dc17d 100644 --- a/test/ProblemList.txt +++ b/test/ProblemList.txt @@ -1181,21 +1181,6 @@ sun/tools/jps/jps-m.sh generic-all # Server name error, port 2098 problem? sun/tools/jstatd/jstatdServerName.sh generic-all -# These tests fail on solaris sparc, all the time -com/sun/servicetag/DeleteServiceTag.java generic-all -com/sun/servicetag/DuplicateNotFound.java generic-all -com/sun/servicetag/FindServiceTags.java generic-all -com/sun/servicetag/InstanceUrnCheck.java generic-all -com/sun/servicetag/InvalidRegistrationData.java generic-all -com/sun/servicetag/InvalidServiceTag.java generic-all -com/sun/servicetag/JavaServiceTagTest.java generic-all -com/sun/servicetag/JavaServiceTagTest1.java generic-all -com/sun/servicetag/NewRegistrationData.java generic-all -com/sun/servicetag/SystemRegistryTest.java generic-all -com/sun/servicetag/TestLoadFromXML.java generic-all -com/sun/servicetag/UpdateServiceTagTest.java generic-all -com/sun/servicetag/ValidRegistrationData.java generic-all - # Problems on windows, jmap.exe hangs? com/sun/tools/attach/BasicTests.sh windows-all