make/RunTests.gmk

*** 91,10 ***
--- 91,13 ---
  endif
  
  JTREG_FAILURE_HANDLER_DIR := $(TEST_IMAGE_DIR)/failure_handler
  JTREG_FAILURE_HANDLER := $(JTREG_FAILURE_HANDLER_DIR)/jtregFailureHandler.jar
  
+ JTREG_MAIN_WRAPPER_DIR := $(TEST_IMAGE_DIR)/jtreg_main_wrapper
+ JTREG_MAIN_WRAPPER_JAR := $(JTREG_MAIN_WRAPPER_DIR)/jtregMainWrapper.jar
+ 
  JTREG_FAILURE_HANDLER_TIMEOUT ?= 0
  
  ifneq ($(wildcard $(JTREG_FAILURE_HANDLER)), )
    JTREG_FAILURE_HANDLER_OPTIONS := \
        -timeoutHandlerDir:$(JTREG_FAILURE_HANDLER) \

*** 198,11 ***
  $(eval $(call SetTestOpt,FAILURE_HANDLER_TIMEOUT,JTREG))
  $(eval $(call SetTestOpt,REPORT,JTREG))
  
  $(eval $(call ParseKeywordVariable, JTREG, \
      SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR FAILURE_HANDLER_TIMEOUT \
!         TEST_MODE ASSERT VERBOSE RETAIN MAX_MEM RUN_PROBLEM_LISTS \
          RETRY_COUNT REPEAT_COUNT MAX_OUTPUT REPORT $(CUSTOM_JTREG_SINGLE_KEYWORDS), \
      STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \
          EXTRA_PROBLEM_LISTS LAUNCHER_OPTIONS \
          $(CUSTOM_JTREG_STRING_KEYWORDS), \
  ))
--- 201,11 ---
  $(eval $(call SetTestOpt,FAILURE_HANDLER_TIMEOUT,JTREG))
  $(eval $(call SetTestOpt,REPORT,JTREG))
  
  $(eval $(call ParseKeywordVariable, JTREG, \
      SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR FAILURE_HANDLER_TIMEOUT \
!         TEST_MODE ASSERT VERBOSE RETAIN MAIN_WRAPPER MAX_MEM RUN_PROBLEM_LISTS \
          RETRY_COUNT REPEAT_COUNT MAX_OUTPUT REPORT $(CUSTOM_JTREG_SINGLE_KEYWORDS), \
      STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \
          EXTRA_PROBLEM_LISTS LAUNCHER_OPTIONS \
          $(CUSTOM_JTREG_STRING_KEYWORDS), \
  ))

*** 592,10 ***
--- 595,13 ---
    endif
  
    # Set library path for native dependencies
    $1_JMH_JVM_ARGS := -Djava.library.path=$$(TEST_IMAGE_DIR)/micro/native
  
+   # Allow preview features in microbenchmarks
+   $1_JMH_JVM_ARGS += --enable-preview
+ 
    ifneq ($$(MICRO_VM_OPTIONS)$$(MICRO_JAVA_OPTIONS), )
      $1_JMH_JVM_ARGS += $$(MICRO_VM_OPTIONS) $$(MICRO_JAVA_OPTIONS)
    endif
  
    $1_MICRO_VM_OPTIONS := -jvmArgs $(call ShellQuote,$$($1_JMH_JVM_ARGS))

*** 741,10 ***
--- 747,11 ---
  
    JTREG_TIMEOUT_FACTOR ?= 4
  
    JTREG_VERBOSE ?= fail,error,summary
    JTREG_RETAIN ?= fail,error
+   JTREG_MAIN_WRAPPER ?=
    JTREG_RUN_PROBLEM_LISTS ?= false
    JTREG_RETRY_COUNT ?= 0
    JTREG_REPEAT_COUNT ?= 0
    JTREG_REPORT ?= files
  

*** 754,10 ***
--- 761,16 ---
        $$(info Please choose one or the other.)
        $$(error Cannot continue)
      endif
    endif
  
+   ifneq ($$(JTREG_MAIN_WRAPPER), )
+     JT_HOME = $$(JT_HOME_MW)
+     $1_JTREG_BASIC_OPTIONS += -mainWrapperPath:$$(JTREG_MAIN_WRAPPER_JAR)
+     $1_JTREG_BASIC_OPTIONS += -mainWrapper:$$(JTREG_MAIN_WRAPPER)
+   endif
+ 
    ifneq ($$(JTREG_LAUNCHER_OPTIONS), )
      $1_JTREG_LAUNCHER_OPTIONS += $$(JTREG_LAUNCHER_OPTIONS)
    endif
  
    ifneq ($$(JTREG_MAX_OUTPUT), )