Merge
authoramurillo
Tue, 16 Aug 2016 08:08:00 -0700
changeset 40353 6257fd74ced4
parent 40352 c2a7d79947a1 (diff)
parent 40351 65f666dc21a6 (current diff)
child 40354 67a4004bb582
Merge
hotspot/test/runtime/modules/Visibility/XpatchVisibility.java
hotspot/test/runtime/modules/Xpatch/BasicJarBuilder.java
hotspot/test/runtime/modules/Xpatch/Xpatch2Dirs.java
hotspot/test/runtime/modules/Xpatch/Xpatch2DirsMain.java
hotspot/test/runtime/modules/Xpatch/XpatchDupJavaBase.java
hotspot/test/runtime/modules/Xpatch/XpatchDupModule.java
hotspot/test/runtime/modules/Xpatch/XpatchJavaBase.java
hotspot/test/runtime/modules/Xpatch/XpatchMain.java
hotspot/test/runtime/modules/Xpatch/XpatchTest.java
hotspot/test/runtime/modules/Xpatch/XpatchTestJar.java
hotspot/test/runtime/modules/Xpatch/XpatchTestJarDir.java
hotspot/test/runtime/modules/Xpatch/XpatchTraceCL.java
hotspot/test/runtime/modules/XpatchCDS.java
jdk/src/java.base/share/conf/security/cacerts
jdk/test/sun/security/mscapi/AccessKeyStore.sh
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/MessageRetriever.java
langtools/test/jdk/javadoc/tool/generics/genericClass/Main.java
langtools/test/jdk/javadoc/tool/generics/genericClass/expected.out
langtools/test/jdk/javadoc/tool/generics/genericClass/pkg1/A.java
langtools/test/jdk/javadoc/tool/generics/genericInnerAndOuter/Main.java
langtools/test/jdk/javadoc/tool/generics/genericInnerAndOuter/expected.out
langtools/test/jdk/javadoc/tool/generics/genericInnerAndOuter/pkg1/O.java
langtools/test/jdk/javadoc/tool/generics/genericInnerAndOuter/pkg1/X.java
langtools/test/jdk/javadoc/tool/generics/genericInterface/Main.java
langtools/test/jdk/javadoc/tool/generics/genericInterface/expected.out
langtools/test/jdk/javadoc/tool/generics/genericInterface/pkg1/A.java
langtools/test/jdk/javadoc/tool/generics/genericMethod/Main.java
langtools/test/jdk/javadoc/tool/generics/genericMethod/expected.out
langtools/test/jdk/javadoc/tool/generics/genericMethod/pkg1/A.java
langtools/test/jdk/javadoc/tool/generics/genericSuper/Main.java
langtools/test/jdk/javadoc/tool/generics/genericSuper/expected.out
langtools/test/jdk/javadoc/tool/generics/genericSuper/pkg1/A.java
langtools/test/jdk/javadoc/tool/generics/supertypes/Main.java
langtools/test/jdk/javadoc/tool/generics/supertypes/expected.out
langtools/test/jdk/javadoc/tool/generics/supertypes/pkg1/A.java
langtools/test/jdk/javadoc/tool/generics/supertypes/pkg1/B.java
langtools/test/jdk/javadoc/tool/generics/throwsGeneric/Main.java
langtools/test/jdk/javadoc/tool/generics/throwsGeneric/expected.out
langtools/test/jdk/javadoc/tool/generics/throwsGeneric/pkg1/A.java
langtools/test/jdk/javadoc/tool/generics/tparamCycle/Main.java
langtools/test/jdk/javadoc/tool/generics/tparamCycle/pkg1/LikeEnum.java
langtools/test/jdk/javadoc/tool/generics/tparamTagOnMethod/Main.java
langtools/test/jdk/javadoc/tool/generics/tparamTagOnMethod/expected.out
langtools/test/jdk/javadoc/tool/generics/tparamTagOnMethod/pkg1/A.java
langtools/test/jdk/javadoc/tool/generics/tparamTagOnType/Main.java
langtools/test/jdk/javadoc/tool/generics/tparamTagOnType/expected.out
langtools/test/jdk/javadoc/tool/generics/tparamTagOnType/pkg1/A.java
langtools/test/jdk/javadoc/tool/generics/wildcards/Main.java
langtools/test/jdk/javadoc/tool/generics/wildcards/expected.out
langtools/test/jdk/javadoc/tool/generics/wildcards/pkg1/A.java
langtools/test/jdk/javadoc/tool/imports/I.java
langtools/test/jdk/javadoc/tool/imports/MissingImport.java
langtools/test/jdk/javadoc/tool/lib/Tester.java
langtools/test/tools/javac/MethodParameters/Tester.java
langtools/test/tools/javac/diags/examples/InvalidArgForXPatch/InvalidArgForXpatch.java
langtools/test/tools/javac/options/modes/Tester.java
langtools/test/tools/javadoc/lib/Tester.java
langtools/test/tools/javap/output/Tester.java
--- a/hotspot/test/serviceability/sa/sadebugd/SADebugDTest.java	Fri Aug 12 13:58:14 2016 -0700
+++ b/hotspot/test/serviceability/sa/sadebugd/SADebugDTest.java	Tue Aug 16 08:08:00 2016 -0700
@@ -28,6 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib/share/classes
  *
+ * @ignore 8163805
  * @run main/othervm SADebugDTest
  */
 import java.io.File;