*** old/make/RunTests.gmk	Mon Aug 28 10:31:24 2017
--- new/make/RunTests.gmk	Mon Aug 28 10:31:23 2017

*** 326,338 ****
--- 326,338 ----
    ifeq ($$(shell $$(EXPR) $$($1_JTREG_JOBS) \> 50), 1)
      # Until CODETOOLS-7901892 is fixed, JTreg cannot handle more than 50 jobs
      $1_JTREG_JOBS := 50
    endif
  
!   # Make sure MaxRAMFraction is high enough to not cause OOM or swapping since
!   # 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_FRACTION := $$(shell $$(EXPR) $$($1_JTREG_JOBS) \* 4)
!   $1_JTREG_MAX_RAM_PERCENTAGE := $$(shell $$(EXPR) 25 / $$($1_JTREG_JOBS))
  
    JTREG_TIMEOUT ?= 4
    JTREG_VERBOSE ?= fail,error,summary
    JTREG_RETAIN ?= fail,error
  

*** 342,352 ****
--- 342,352 ----
    endif
  
    $1_JTREG_BASIC_OPTIONS += -$$($1_JTREG_TEST_MODE) \
        -verbose:$$(JTREG_VERBOSE) -retain:$$(JTREG_RETAIN) \
        -concurrency:$$($1_JTREG_JOBS) -timeoutFactor:$$(JTREG_TIMEOUT) \
!       -vmoption:-XX:MaxRAMFraction=$$($1_JTREG_MAX_RAM_FRACTION)
!       -vmoption:-XX:MaxRAMPercentage=$$($1_JTREG_MAX_RAM_PERCENTAGE)
  
    $1_JTREG_BASIC_OPTIONS += -automatic -keywords:\!ignore -ignore:quiet
  
    # Some tests needs to find a boot JDK using the JDK8_HOME variable.
    $1_JTREG_BASIC_OPTIONS += -e:JDK8_HOME=$$(BOOT_JDK)