# HG changeset patch
# User coleenp
# Date 1536755191 14400
# Node ID bc9faf59936d2e53f48e810247e6975ebc0697b3
# Parent  8ba5b3c768576a9d265dd81788681b629b37dd22
8210624: Clean up better loading tests
Reviewed-by: hseigel, jwilhelm

diff -r 8ba5b3c76857 -r bc9faf59936d test/hotspot/jtreg/runtime/ClassUnload/ConstantPoolDependsTest.java
--- a/test/hotspot/jtreg/runtime/ClassUnload/ConstantPoolDependsTest.java	Mon Sep 10 16:49:01 2018 -0400
+++ b/test/hotspot/jtreg/runtime/ClassUnload/ConstantPoolDependsTest.java	Wed Sep 12 08:26:31 2018 -0400
@@ -25,6 +25,7 @@
  * @test ConstantPoolDependsTest
  * @bug 8210094
  * @summary Create ClassLoader dependency from initiating loader to class loader through constant pool reference
+ * @requires vm.opt.final.ClassUnloading
  * @modules java.base/jdk.internal.misc
  *          java.compiler
  * @library /runtime/testlibrary /test/lib
@@ -32,7 +33,7 @@
  * @compile p2/c2.java MyDiffClassLoader.java
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+PrintSystemDictionaryAtExit -Xlog:class+unload=trace -XX:+WhiteBoxAPI ConstantPoolDependsTest
+ * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -Xlog:class+unload -XX:+WhiteBoxAPI ConstantPoolDependsTest
  */
 
 import sun.hotspot.WhiteBox;
diff -r 8ba5b3c76857 -r bc9faf59936d test/hotspot/jtreg/runtime/ClassUnload/DictionaryDependsTest.java
--- a/test/hotspot/jtreg/runtime/ClassUnload/DictionaryDependsTest.java	Mon Sep 10 16:49:01 2018 -0400
+++ b/test/hotspot/jtreg/runtime/ClassUnload/DictionaryDependsTest.java	Wed Sep 12 08:26:31 2018 -0400
@@ -25,6 +25,7 @@
  * @test DictionaryDependsTest
  * @bug 8210094
  * @summary Create ClassLoader dependency from initiating loader to class loader through reflection
+ * @requires vm.opt.final.ClassUnloading
  * @modules java.base/jdk.internal.misc
  *          java.compiler
  * @library /runtime/testlibrary /test/lib
@@ -32,7 +33,7 @@
  * @compile p2/c2.java MyDiffClassLoader.java
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -Xlog:class+unload=trace -XX:+WhiteBoxAPI DictionaryDependsTest
+ * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -Xlog:class+unload -XX:+WhiteBoxAPI DictionaryDependsTest
  */
 import sun.hotspot.WhiteBox;
 import java.lang.reflect.Method;
diff -r 8ba5b3c76857 -r bc9faf59936d test/hotspot/jtreg/runtime/ClassUnload/SuperDependsTest.java
--- a/test/hotspot/jtreg/runtime/ClassUnload/SuperDependsTest.java	Mon Sep 10 16:49:01 2018 -0400
+++ b/test/hotspot/jtreg/runtime/ClassUnload/SuperDependsTest.java	Wed Sep 12 08:26:31 2018 -0400
@@ -25,7 +25,7 @@
  * @test SuperDependsTest
  * @bug 8210094
  * @summary Create ClassLoader dependency from initiating loader to class loader through subclassing
- * @library /test/lib
+ * @requires vm.opt.final.ClassUnloading
  * @modules java.base/jdk.internal.misc
  *          java.compiler
  * @library /runtime/testlibrary /test/lib
@@ -33,7 +33,7 @@
  * @compile p2/c2.java MyDiffClassLoader.java
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+PrintSystemDictionaryAtExit -Xlog:class+unload=trace -XX:+WhiteBoxAPI SuperDependsTest
+ * @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -Xlog:class+unload -XX:+WhiteBoxAPI SuperDependsTest
  */
 import sun.hotspot.WhiteBox;
 import p2.*;