hotspot/test/Makefile

*** 304,314 ****
  ifdef TESTDIRS
    TEST_SELECTION = $(TESTDIRS)
  endif
  
  ifdef CONCURRENCY
!   EXTRA_JTREG_OPTIONS += -concurrency:$(CONCURRENCY)
  endif
  
  # Default JTREG to run
  JTREG = $(JT_HOME)/bin/jtreg
  
--- 304,317 ----
  ifdef TESTDIRS
    TEST_SELECTION = $(TESTDIRS)
  endif
  
  ifdef CONCURRENCY
!   JTREG_BASIC_OPTIONS += -concurrency:$(CONCURRENCY)
! endif
! ifdef EXTRA_JTREG_OPTIONS
!   JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS)
  endif
  
  # Default JTREG to run
  JTREG = $(JT_HOME)/bin/jtreg
  
*** 324,335 ****
  JTREG_IGNORE_OPTION = -ignore:quiet
  JTREG_BASIC_OPTIONS += $(JTREG_IGNORE_OPTION)
  # Multiply by 4 the timeout factor
  JTREG_TIMEOUT_OPTION =  -timeoutFactor:4
  JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION)
- # Add any extra options
- JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS)
  # Set other vm and test options
  JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_OPTIONS:%=-vmoption:%) $(JAVA_VM_ARGS:%=-vmoption:%)
  
  # Option to tell jtreg to not run tests marked with "ignore"
  ifeq ($(PLATFORM), windows)
--- 327,336 ----