langtools/test/Makefile

*** 84,93 ****
--- 84,95 ----
  endif
  
  # Default JTREG to run
  ifdef JPRT_JTREG_HOME
    JTREG_HOME = $(JPRT_JTREG_HOME)
+ else ifdef JT_HOME
+   JTREG_HOME = $(JT_HOME)
  else
    JTREG_HOME = $(SLASH_JAVA)/re/jtreg/4.1-jigsaw/nightly/binaries/jtreg/
  endif
  JTREG = $(JTREG_HOME)/bin/jtreg
  JTDIFF = $(JTREG_HOME)/bin/jtdiff
*** 111,124 ****
  
  # Default JDK for JTREG and JCK
  #
  # JT_JAVA is the version of java used to run jtreg/JCK. 
  #
! ifdef JPRT_JAVA_HOME
    JT_JAVA = $(JPRT_JAVA_HOME)
! else
    JT_JAVA = $(SLASH_JAVA)/re/jdk/1.9.0/archive/fcs/binaries/$(PLATFORM)-$(ARCH)
  endif
  
  # Default JDK to test
  ifdef JPRT_IMPORT_PRODUCT_HOME
    TESTJAVA = $(JPRT_IMPORT_PRODUCT_HOME)
--- 113,128 ----
  
  # Default JDK for JTREG and JCK
  #
  # JT_JAVA is the version of java used to run jtreg/JCK. 
  #
! ifndef JT_JAVA
!   ifdef JPRT_JAVA_HOME
      JT_JAVA = $(JPRT_JAVA_HOME)
!   else
      JT_JAVA = $(SLASH_JAVA)/re/jdk/1.9.0/archive/fcs/binaries/$(PLATFORM)-$(ARCH)
+   endif
  endif
  
  # Default JDK to test
  ifdef JPRT_IMPORT_PRODUCT_HOME
    TESTJAVA = $(JPRT_IMPORT_PRODUCT_HOME)
*** 147,156 ****
--- 151,164 ----
    JCK_OPTIONS += \
          -vmoptions:-Xbootclasspath/p:$(TESTBOOTCLASSPATH) \
          -refvmoptions:-Xbootclasspath/p:$(TESTBOOTCLASSPATH)
  endif
  
+ ifdef EXTRA_JTREG_OPTIONS
+   JTREG_OPTIONS += $(EXTRA_JTREG_OPTIONS)
+ endif
+ 
  # Concurrency is the number of tests that can execute at once.
  # On an otherwise empty machine, suggest setting to (#cpus + 2)
  # If unset, the default is (#cpus)
  ### RFE: determine and use #cpus
  ifdef CONCURRENCY
*** 260,269 ****
--- 268,283 ----
  javadoc:        JTREG_TESTDIRS = tools/javadoc com/sun/javadoc
  javah:          JTREG_TESTDIRS = tools/javah
  javap:          JTREG_TESTDIRS = tools/javap
  jdeps:          JTREG_TESTDIRS = tools/jdeps
  
+ # a way to select jtreg tests from outside
+ ifdef TEST_SELECTION
+   JTREG_TESTDIRS = $(TEST_SELECTION)
+ endif
+ 
+ 
  # Run jtreg tests
  #
  # JTREG_HOME
  #       Installed location of jtreg
  # JT_JAVA