test/TestCommon.gmk

*** 356,377 ****
  ifndef CONCURRENCY_FACTOR
    CONCURRENCY_FACTOR = 1
  endif
  
  # Concurrency based on min(cores / 2, 12) * CONCURRENCY_FACTOR
! CONCURRENCY := $(shell awk \
    'BEGIN { \
      c = $(NUM_CORES) / 2; \
      if (c > 12) c = 12; \
      c = c * $(CONCURRENCY_FACTOR); \
      if (c < 1) c = 1; \
      printf "%.0f", c; \
    }')
  JTREG_BASIC_OPTIONS += -concurrency:$(CONCURRENCY)
  
! # Make sure MaxRAMPercentage is high enough to not cause OOM or swapping since we may end up with a lot of JVM's
! JTREG_BASIC_OPTIONS += -vmoption:-XX:MaxRAMPercentage=$(shell expr 25 / $(CONCURRENCY))
  
  ifdef EXTRA_JTREG_OPTIONS
    JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS)
  endif
  
--- 356,379 ----
  ifndef CONCURRENCY_FACTOR
    CONCURRENCY_FACTOR = 1
  endif
  
  # Concurrency based on min(cores / 2, 12) * CONCURRENCY_FACTOR
! CONCURRENCY := $(shell $(AWK) \
    'BEGIN { \
      c = $(NUM_CORES) / 2; \
      if (c > 12) c = 12; \
      c = c * $(CONCURRENCY_FACTOR); \
      if (c < 1) c = 1; \
      printf "%.0f", c; \
    }')
  JTREG_BASIC_OPTIONS += -concurrency:$(CONCURRENCY)
  
! # Make sure MaxRAMPercentage is low enough to not cause OOM or swapping since
! # we may end up with a lot of JVM's
! MAX_RAM_PERCENTAGE := $(shell expr 25 / $(CONCURRENCY))
! JTREG_BASIC_OPTIONS += -vmoption:-XX:MaxRAMPercentage=$(MAX_RAM_PERCENTAGE)
  
  ifdef EXTRA_JTREG_OPTIONS
    JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS)
  endif