make/RunTests.gmk

*** 298,11 ***
  $(eval $(call SetTestOpt,TIMEOUT_FACTOR,JTREG))
  $(eval $(call SetTestOpt,FAILURE_HANDLER_TIMEOUT,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, \
      STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \
          EXTRA_PROBLEM_LISTS AOT_MODULES, \
  ))
  
--- 298,11 ---
  $(eval $(call SetTestOpt,TIMEOUT_FACTOR,JTREG))
  $(eval $(call SetTestOpt,FAILURE_HANDLER_TIMEOUT,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, \
      STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \
          EXTRA_PROBLEM_LISTS AOT_MODULES, \
  ))
  

*** 850,13 ***
--- 850,19 ---
    else
      JTREG_TIMEOUT_FACTOR ?= 4
    endif
    JTREG_VERBOSE ?= fail,error,summary
    JTREG_RETAIN ?= fail,error
+   JTREG_MAIN_WRAPPER ?=
    JTREG_RUN_PROBLEM_LISTS ?= false
    JTREG_RETRY_COUNT ?= 0
  
+   ifneq ($$(JTREG_MAIN_WRAPPER), )
+     JT_HOME = $$(JT_HOME_MW)
+     $1_JTREG_BASIC_OPTIONS += -mainWrapper:$$(JTREG_MAIN_WRAPPER)
+   endif
+ 
    ifneq ($$($1_JTREG_MAX_MEM), 0)
      $1_JTREG_BASIC_OPTIONS += -vmoption:-Xmx$$($1_JTREG_MAX_MEM)
      $1_JTREG_LAUNCHER_OPTIONS += -Xmx$$($1_JTREG_MAX_MEM)
    endif