make/Main.gmk

*** 745,10 ***
--- 745,26 ---
        TARGET := images, \
        DEPS := build-test-failure-handler, \
    ))
  endif
  
+ ifeq ($(BUILD_JTREG_TEST_THREAD_FACTORY), true)
+   # Builds the test thread factory jtreg extension
+   $(eval $(call SetupTarget, build-test-test-thread-factory, \
+       MAKEFILE := test/BuildJtregTestThreadFactory, \
+       TARGET := build, \
+       DEPS := interim-langtools, \
+   ))
+ 
+   # Copies the jtreg test thread factory into the test image
+   $(eval $(call SetupTarget, test-image-test-thread-factory, \
+       MAKEFILE := test/BuildJtregTestThreadFactory, \
+       TARGET := images, \
+       DEPS := build-test-test-thread-factory, \
+   ))
+ endif
+ 
  $(eval $(call SetupTarget, build-microbenchmark, \
      MAKEFILE := test/BuildMicrobenchmark, \
      DEPS := interim-langtools exploded-image, \
  ))
  

*** 1225,10 ***
--- 1241,14 ---
  
  ifeq ($(BUILD_FAILURE_HANDLER), true)
    test-image: test-image-failure-handler
  endif
  
+ ifeq ($(BUILD_JTREG_TEST_THREAD_FACTORY), true)
+   test-image: test-image-test-thread-factory
+ endif
+ 
  ifneq ($(JMH_CORE_JAR), )
    test-image: build-microbenchmark
  endif
  
  ################################################################################