equal
deleted
inserted
replaced
312 ifdef JPRT_JTREG_HOME |
312 ifdef JPRT_JTREG_HOME |
313 JT_HOME = $(JPRT_JTREG_HOME) |
313 JT_HOME = $(JPRT_JTREG_HOME) |
314 endif |
314 endif |
315 endif |
315 endif |
316 |
316 |
|
317 # Problematic tests to be excluded |
|
318 PROBLEM_LISTS=$(call MixedDirs,$(wildcard ProblemList.txt closed/ProblemList.txt)) |
|
319 |
|
320 # Create exclude list for this platform and arch |
|
321 ifdef NO_EXCLUDES |
|
322 JTREG_EXCLUSIONS = |
|
323 else |
|
324 JTREG_EXCLUSIONS = $(PROBLEM_LISTS:%=-exclude:%) |
|
325 endif |
|
326 |
|
327 # convert list of directories to dos paths |
|
328 define MixedDirs |
|
329 $(foreach i,$1,$(shell $(GETMIXEDPATH) "${i}")) |
|
330 endef |
|
331 |
317 # When called from JPRT the TESTDIRS variable is set to the jtreg tests to run |
332 # When called from JPRT the TESTDIRS variable is set to the jtreg tests to run |
318 ifdef TESTDIRS |
333 ifdef TESTDIRS |
319 TEST_SELECTION = $(TESTDIRS) |
334 TEST_SELECTION = $(TESTDIRS) |
320 endif |
335 endif |
321 |
336 |
325 ifeq ($(CONCURRENCY), 0) |
340 ifeq ($(CONCURRENCY), 0) |
326 CONCURRENCY := 1 |
341 CONCURRENCY := 1 |
327 else ifeq ($(shell expr $(CONCURRENCY) \> 12), 1) |
342 else ifeq ($(shell expr $(CONCURRENCY) \> 12), 1) |
328 CONCURRENCY := 12 |
343 CONCURRENCY := 12 |
329 endif |
344 endif |
330 else |
345 else |
331 CONCURRENCY := 1 |
346 CONCURRENCY := 1 |
332 endif |
347 endif |
333 JTREG_BASIC_OPTIONS += -concurrency:$(CONCURRENCY) |
348 JTREG_BASIC_OPTIONS += -concurrency:$(CONCURRENCY) |
334 |
349 |
335 # Make sure MaxRAMFraction is high enough to not cause OOM or swapping since we may end up with a lot of JVM's |
350 # Make sure MaxRAMFraction is high enough to not cause OOM or swapping since we may end up with a lot of JVM's |