test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java

*** 68,10 ***
--- 68,12 ---
              case RunMode.ASSEMBLY:
              case RunMode.PRODUCTION:
                  return new String[] {
                      "-XX:+UnlockDiagnosticVMOptions",
                      "-XX:" + (flag_sign == 0 ? "-" : "+") + "AOTAdapterCaching",
+                     "-XX:" + (flag_sign == 0 ? "-" : "+") + "AOTStubCaching",
+                     "-XX:" + (flag_sign == 0 ? "-" : "+") + "AOTCodeCaching",
                      "-Xlog:aot+codecache+init=debug",
                      "-Xlog:aot+codecache+exit=debug",
                  };
              }
              return new String[] {};

*** 88,19 ***
          public void checkExecution(OutputAnalyzer out, RunMode runMode) throws Exception {
              if (flag_sign == 0) {
                  switch (runMode) {
                  case RunMode.ASSEMBLY:
                  case RunMode.PRODUCTION:
!                     out.shouldNotContain("Adapters:  total");
                      break;
                  }
  
              } else {
                  switch (runMode) {
                  case RunMode.ASSEMBLY:
                  case RunMode.PRODUCTION:
!                     out.shouldContain("Adapters:  total");
                      break;
                  }
              }
          }
  
--- 90,19 ---
          public void checkExecution(OutputAnalyzer out, RunMode runMode) throws Exception {
              if (flag_sign == 0) {
                  switch (runMode) {
                  case RunMode.ASSEMBLY:
                  case RunMode.PRODUCTION:
!                     out.shouldNotContain("AOT code cache size: ");
                      break;
                  }
  
              } else {
                  switch (runMode) {
                  case RunMode.ASSEMBLY:
                  case RunMode.PRODUCTION:
!                     out.shouldContain("AOT code cache size: ");
                      break;
                  }
              }
          }