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_TEST_THREAD_FACTORY_DIR := $(TEST_IMAGE_DIR)/jtreg_test_thread_factory
+ JTREG_TEST_THREAD_FACTORY_JAR := $(JTREG_TEST_THREAD_FACTORY_DIR)/jtregTestThreadFactory.jar
+ 
  JTREG_FAILURE_HANDLER_TIMEOUT ?= 0
  
  ifneq ($(wildcard $(JTREG_FAILURE_HANDLER)), )
    JTREG_FAILURE_HANDLER_OPTIONS := \
        -timeoutHandlerDir:$(JTREG_FAILURE_HANDLER) \

@@ -198,11 +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 MAX_MEM RUN_PROBLEM_LISTS \
+         TEST_MODE ASSERT VERBOSE RETAIN TEST_THREAD_FACTORY 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), \
  ))

@@ -750,10 +753,11 @@
  
    JTREG_TIMEOUT_FACTOR ?= 4
  
    JTREG_VERBOSE ?= fail,error,summary
    JTREG_RETAIN ?= fail,error
+   JTREG_TEST_THREAD_FACTORY ?=
    JTREG_RUN_PROBLEM_LISTS ?= false
    JTREG_RETRY_COUNT ?= 0
    JTREG_REPEAT_COUNT ?= 0
    JTREG_REPORT ?= files
  

@@ -763,10 +767,16 @@
        $$(info Please choose one or the other.)
        $$(error Cannot continue)
      endif
    endif
  
+   ifneq ($$(JTREG_TEST_THREAD_FACTORY), )
+     $1_JTREG_BASIC_OPTIONS += -testThreadFactoryPath:$$(JTREG_TEST_THREAD_FACTORY_JAR)
+     $1_JTREG_BASIC_OPTIONS += -testThreadFactory:$$(JTREG_TEST_THREAD_FACTORY)
+     $1_JTREG_BASIC_OPTIONS += -exclude:$$(addprefix $$($1_TEST_ROOT)/, ProblemList-$$(JTREG_TEST_THREAD_FACTORY).txt)
+   endif
+ 
    ifneq ($$(JTREG_LAUNCHER_OPTIONS), )
      $1_JTREG_LAUNCHER_OPTIONS += $$(JTREG_LAUNCHER_OPTIONS)
    endif
  
    ifneq ($$(JTREG_MAX_OUTPUT), )