test/hotspot/jtreg/runtime/cds/appcds/aotCache/SpecialCacheNames.java

@@ -21,12 +21,12 @@
   * questions.
   *
   */
  
  /*
-  * @test
-  * @summary Use special characters in the name of the cache file specified by -XX:AOTCacheOutput
+  * @test id=aot
+  * @summary Use special characters in the name of the cache file specified by -XX:AOTCacheOutput.
   *          Make sure these characters are passed to the child JVM process that assembles the cache.
   * @requires vm.cds.supports.aot.class.linking
   * @comment work around JDK-8345635
   * @requires !vm.jvmci.enabled
   * @library /test/lib

@@ -57,11 +57,11 @@
              test("unicode\u6587", args); // CJK unifed ideographs "wen" = "script"
          }
      }
  
      static void test(String name, String[] args) throws Exception {
-         String archiveName = name + (args[0].equals("LEYDEN") ? ".cds" : ".aot");
+         String archiveName = name + ".aot";
  
          System.out.println("============================= Testing with AOT cache name: {{" + archiveName + "}}");
          new Tester(name, archiveName).run(args);
      }