equal
deleted
inserted
replaced
1 # |
1 # |
2 # Copyright (c) 1995, 2016, Oracle and/or its affiliates. All rights reserved. |
2 # Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # |
4 # |
5 # This code is free software; you can redistribute it and/or modify it |
5 # This code is free software; you can redistribute it and/or modify it |
6 # under the terms of the GNU General Public License version 2 only, as |
6 # under the terms of the GNU General Public License version 2 only, as |
7 # published by the Free Software Foundation. Oracle designates this |
7 # published by the Free Software Foundation. Oracle designates this |
367 JTREG_TESTVM_MEMORY_OPTION = -vmoption:-Xmx512m |
367 JTREG_TESTVM_MEMORY_OPTION = -vmoption:-Xmx512m |
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 # Give aot tests access to Visual Studio installation |
|
373 ifneq ($(VS120COMNTOOLS), ) |
|
374 JTREG_BASIC_OPTIONS += -e:VS120COMNTOOLS=$(shell $(GETMIXEDPATH) "$(VS120COMNTOOLS)") |
|
375 endif |
372 # Set other vm and test options |
376 # Set other vm and test options |
373 JTREG_TEST_OPTIONS += $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_OPTIONS:%=-vmoption:%) $(JAVA_VM_ARGS:%=-vmoption:%) |
377 JTREG_TEST_OPTIONS += $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_OPTIONS:%=-vmoption:%) $(JAVA_VM_ARGS:%=-vmoption:%) |
374 |
378 |
375 ifeq ($(IGNORE_MARKED_TESTS), true) |
379 ifeq ($(IGNORE_MARKED_TESTS), true) |
376 # Option to tell jtreg to not run tests marked with "ignore" |
380 # Option to tell jtreg to not run tests marked with "ignore" |