There are select sets of tests in "CDS mode" defined in tier5 and tier6 (please see hs-tier5-rt.js hs-tier6-rt.js). After the default CDS archive changes are integrated, these test sets need to be converted to be non-CDS-mode. The conversion will provide the necessary test coverages for the non-CDS testing mode.

The following in open/test/TestCommon.gmk also needs cleanup and update:

# Optionally create a CDS archive before running tests
ifeq ($(GENERATE_CDS_ARCHIVE), true)
  CDS_ARCHIVE_FILE := $(ABS_TEST_OUTPUT_DIR)/cds_archive.jsa

  $(CDS_ARCHIVE_FILE): $(PRODUCT_HOME)
        $(PRODUCT_HOME)/bin/java -XX:+UnlockDiagnosticVMOptions \
            -XX:SharedArchiveFile=$(shell $(GETMIXEDPATH) "$(CDS_ARCHIVE_FILE)") -Xshare:dump

  CDS_VM_ARGS := -XX:+UnlockDiagnosticVMOptions -XX:SharedArchiveFile=$(shell $(GETMIXEDPATH) "$(CDS_ARCHIVE_FILE)")
  JTREG_TEST_OPTIONS += $(addprefix -vmoption:, $(CDS_VM_ARGS))
  TEST_PREREQS += $(CDS_ARCHIVE_FILE)
endif