equal
deleted
inserted
replaced
68 CONCURRENCY := 1 |
68 CONCURRENCY := 1 |
69 else ifeq ($(shell expr $(CONCURRENCY) \> 12), 1) |
69 else ifeq ($(shell expr $(CONCURRENCY) \> 12), 1) |
70 CONCURRENCY := 12 |
70 CONCURRENCY := 12 |
71 endif |
71 endif |
72 |
72 |
73 # Make sure MaxRAMFraction is high enough to not cause OOM or swapping since we may end up with a lot of JVM's |
73 # Make sure MaxRAMPercentage is high enough to not cause OOM or swapping since we may end up with a lot of JVM's |
74 JTREG_BASIC_OPTIONS += -vmoption:-XX:MaxRAMFraction=$(shell expr $(CONCURRENCY) \* 4) |
74 JTREG_BASIC_OPTIONS += -vmoption:-XX:MaxRAMPercentage=$(shell expr 25 / $(CONCURRENCY)) |
75 |
75 |
76 # Include the common base file with most of the logic |
76 # Include the common base file with most of the logic |
77 include ../../test/TestCommon.gmk |
77 include ../../test/TestCommon.gmk |
78 |
78 |
79 ################################################################ |
79 ################################################################ |