test/hotspot/jtreg/runtime/cds/appcds/LotsOfSyntheticClasses.java

*** 118,13 ***
          // Step 2. Try to dump the archive.
          {
              OutputAnalyzer output = TestCommon.createArchive(
                  APP_JAR.toString(),
                  listAppClasses(),
-                 MAIN_CLASS_NAME,
                  // Verification for lots of classes slows down the test.
                  "-XX:+IgnoreUnrecognizedVMOptions",
                  "-XX:-VerifyDependencies",
                  "-XX:-VerifyBeforeExit"
              );
              TestCommon.checkDump(output);
          }
--- 118,14 ---
          // Step 2. Try to dump the archive.
          {
              OutputAnalyzer output = TestCommon.createArchive(
                  APP_JAR.toString(),
                  listAppClasses(),
                  // Verification for lots of classes slows down the test.
                  "-XX:+IgnoreUnrecognizedVMOptions",
+                 "-XX:+UnlockDiagnosticVMOptions",
+                 "-XX:-ArchiveLoaderLookupCache", // LEYDEN_ONLY - work around JDK-8365959
                  "-XX:-VerifyDependencies",
                  "-XX:-VerifyBeforeExit"
              );
              TestCommon.checkDump(output);
          }

*** 132,10 ***
--- 133,11 ---
          // Step 3. Try to run, touching every class.
          {
              TestCommon.run(
                  // Verification for lots of classes slows down the test.
                  "-XX:+IgnoreUnrecognizedVMOptions",
+                 "-XX:+UnlockDiagnosticVMOptions",
                  "-XX:-VerifyDependencies",
                  "-XX:-VerifyBeforeExit",
                  "-cp", APP_JAR.toString(),
                  MAIN_CLASS_NAME).
                      assertNormalExit("Success");