make/RunTests.gmk

*** 59,69 ****
      $2_$1 := $$(TEST_OPTS_$1)
    endif
  endef
  
  # Setup _NT_SYMBOL_PATH on Windows
! ifeq ($(OPENJDK_TARGET_OS), windows)
    ifndef _NT_SYMBOL_PATH
      # Can't use PathList here as it adds quotes around the value.
      _NT_SYMBOL_PATH := \
          $(subst $(SPACE),;,$(strip \
              $(foreach p, $(sort $(dir $(wildcard \
--- 59,69 ----
      $2_$1 := $$(TEST_OPTS_$1)
    endif
  endef
  
  # Setup _NT_SYMBOL_PATH on Windows
! ifeq ($(call isTargetOs, windows), true)
    ifndef _NT_SYMBOL_PATH
      # Can't use PathList here as it adds quotes around the value.
      _NT_SYMBOL_PATH := \
          $(subst $(SPACE),;,$(strip \
              $(foreach p, $(sort $(dir $(wildcard \
*** 222,232 ****
  TEST_JOBS_FACTOR_JDL ?= 1
  TEST_JOBS_FACTOR_MACHINE ?= 1
  
  ifeq ($(TEST_JOBS), 0)
    CORES_DIVIDER := 2
!   ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
      # For smaller SPARC machines we see reasonable scaling of throughput up to
      # cpus/4 without affecting test reliability. On the bigger machines, cpus/4
      # causes intermittent timeouts.
      ifeq ($(shell $(EXPR) $(NUM_CORES) \> 16), 1)
        CORES_DIVIDER := 5
--- 222,232 ----
  TEST_JOBS_FACTOR_JDL ?= 1
  TEST_JOBS_FACTOR_MACHINE ?= 1
  
  ifeq ($(TEST_JOBS), 0)
    CORES_DIVIDER := 2
!   ifeq ($(call isTargetCpuArch, sparc), true)
      # For smaller SPARC machines we see reasonable scaling of throughput up to
      # cpus/4 without affecting test reliability. On the bigger machines, cpus/4
      # causes intermittent timeouts.
      ifeq ($(shell $(EXPR) $(NUM_CORES) \> 16), 1)
        CORES_DIVIDER := 5
*** 806,816 ****
    # Make sure MaxRAMPercentage is high enough to not cause OOM or swapping since
    # we may end up with a lot of JVM's
    $1_JTREG_MAX_RAM_PERCENTAGE := $$(shell $$(EXPR) 25 / $$($1_JTREG_JOBS))
  
    # SPARC is in general slower per core so need to scale up timeouts a bit.
!   ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
      JTREG_TIMEOUT_FACTOR ?= 8
    else
      JTREG_TIMEOUT_FACTOR ?= 4
    endif
    JTREG_VERBOSE ?= fail,error,summary
--- 806,816 ----
    # Make sure MaxRAMPercentage is high enough to not cause OOM or swapping since
    # we may end up with a lot of JVM's
    $1_JTREG_MAX_RAM_PERCENTAGE := $$(shell $$(EXPR) 25 / $$($1_JTREG_JOBS))
  
    # SPARC is in general slower per core so need to scale up timeouts a bit.
!   ifeq ($(call isTargetCpuArch, sparc), true)
      JTREG_TIMEOUT_FACTOR ?= 8
    else
      JTREG_TIMEOUT_FACTOR ?= 4
    endif
    JTREG_VERBOSE ?= fail,error,summary
*** 833,843 ****
    $1_JTREG_BASIC_OPTIONS += -e:JIB_DATA_DIR
    # Some tests needs to find a boot JDK using the JDK8_HOME variable.
    $1_JTREG_BASIC_OPTIONS += -e:JDK8_HOME=$$(BOOT_JDK)
    # If running on Windows, propagate the _NT_SYMBOL_PATH to enable
    # symbol lookup in hserr files
!   ifeq ($$(OPENJDK_TARGET_OS), windows)
      $1_JTREG_BASIC_OPTIONS += -e:_NT_SYMBOL_PATH
    endif
  
    $1_JTREG_BASIC_OPTIONS += \
        $$(addprefix -javaoption:, $$(JTREG_JAVA_OPTIONS)) \
--- 833,843 ----
    $1_JTREG_BASIC_OPTIONS += -e:JIB_DATA_DIR
    # Some tests needs to find a boot JDK using the JDK8_HOME variable.
    $1_JTREG_BASIC_OPTIONS += -e:JDK8_HOME=$$(BOOT_JDK)
    # If running on Windows, propagate the _NT_SYMBOL_PATH to enable
    # symbol lookup in hserr files
!   ifeq ($$(call isTargetOs, windows), true)
      $1_JTREG_BASIC_OPTIONS += -e:_NT_SYMBOL_PATH
    endif
  
    $1_JTREG_BASIC_OPTIONS += \
        $$(addprefix -javaoption:, $$(JTREG_JAVA_OPTIONS)) \