equal
deleted
inserted
replaced
368 JTREG_TEST_OPTIONS += $(JTREG_TESTVM_MEMORY_OPTION) |
368 JTREG_TEST_OPTIONS += $(JTREG_TESTVM_MEMORY_OPTION) |
369 endif |
369 endif |
370 # Give tests access to JT_JAVA, see JDK-8141609 |
370 # Give tests access to JT_JAVA, see JDK-8141609 |
371 JTREG_BASIC_OPTIONS += -e:JDK8_HOME=${JT_JAVA} |
371 JTREG_BASIC_OPTIONS += -e:JDK8_HOME=${JT_JAVA} |
372 # Set other vm and test options |
372 # Set other vm and test options |
373 JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_OPTIONS:%=-vmoption:%) $(JAVA_VM_ARGS:%=-vmoption:%) |
373 JTREG_TEST_OPTIONS += $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_OPTIONS:%=-vmoption:%) $(JAVA_VM_ARGS:%=-vmoption:%) |
374 |
374 |
375 ifeq ($(IGNORE_MARKED_TESTS), true) |
375 ifeq ($(IGNORE_MARKED_TESTS), true) |
376 # Option to tell jtreg to not run tests marked with "ignore" |
376 # Option to tell jtreg to not run tests marked with "ignore" |
377 ifeq ($(PLATFORM), windows) |
377 ifeq ($(PLATFORM), windows) |
378 JTREG_KEY_OPTION = -k:!ignore |
378 JTREG_KEY_OPTION = -k:!ignore |