equal
deleted
inserted
replaced
1 # |
1 # |
2 # Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved. |
2 # Copyright (c) 1995, 2015, 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 |
108 |
108 |
109 # Expect JPRT to set JPRT_PRODUCT_VM_ARGS (e.g. -Xcomp etc.) |
109 # Expect JPRT to set JPRT_PRODUCT_VM_ARGS (e.g. -Xcomp etc.) |
110 # Should be passed into anything running the vm (java, javac, javadoc, ...). |
110 # Should be passed into anything running the vm (java, javac, javadoc, ...). |
111 ifdef JPRT_PRODUCT_VM_ARGS |
111 ifdef JPRT_PRODUCT_VM_ARGS |
112 JAVA_VM_ARGS = $(JPRT_PRODUCT_VM_ARGS) |
112 JAVA_VM_ARGS = $(JPRT_PRODUCT_VM_ARGS) |
|
113 endif |
|
114 |
|
115 # jtreg -nativepath <dir> |
|
116 # |
|
117 # Local make tests will be TEST_IMAGE_DIR and JPRT with jprt.use.reg.test.bundle=true |
|
118 # should be JPRT_TESTNATIVE_PATH |
|
119 ifdef TEST_IMAGE_DIR |
|
120 TESTNATIVE_DIR = $(TEST_IMAGE_DIR) |
|
121 else ifdef JPRT_TESTNATIVE_PATH |
|
122 TESTNATIVE_DIR = $(JPRT_TESTNATIVE_PATH) |
|
123 endif |
|
124 ifdef TESTNATIVE_DIR |
|
125 JTREG_NATIVE_PATH = -nativepath:$(shell $(GETMIXEDPATH) "$(TESTNATIVE_DIR)/jdk/jtreg/native") |
113 endif |
126 endif |
114 |
127 |
115 # Expect JPRT to set JPRT_ARCHIVE_BUNDLE (path to zip bundle for results) |
128 # Expect JPRT to set JPRT_ARCHIVE_BUNDLE (path to zip bundle for results) |
116 ifdef JPRT_ARCHIVE_BUNDLE |
129 ifdef JPRT_ARCHIVE_BUNDLE |
117 ARCHIVE_BUNDLE = $(JPRT_ARCHIVE_BUNDLE) |
130 ARCHIVE_BUNDLE = $(JPRT_ARCHIVE_BUNDLE) |
311 $(shell $(GETMIXEDPATH) "$(JTREG)") \ |
324 $(shell $(GETMIXEDPATH) "$(JTREG)") \ |
312 $(JTREG_BASIC_OPTIONS) \ |
325 $(JTREG_BASIC_OPTIONS) \ |
313 -r:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTreport") \ |
326 -r:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTreport") \ |
314 -w:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTwork") \ |
327 -w:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTwork") \ |
315 -jdk:$(shell $(GETMIXEDPATH) "$(PRODUCT_HOME)") \ |
328 -jdk:$(shell $(GETMIXEDPATH) "$(PRODUCT_HOME)") \ |
|
329 $(JTREG_NATIVE_PATH) \ |
316 $(JTREG_EXCLUSIONS) \ |
330 $(JTREG_EXCLUSIONS) \ |
317 $(JTREG_TEST_OPTIONS) \ |
331 $(JTREG_TEST_OPTIONS) \ |
318 $(TEST_SELECTION) \ |
332 $(TEST_SELECTION) \ |
319 ) ; \ |
333 ) ; \ |
320 $(BUNDLE_UP_AND_EXIT) \ |
334 $(BUNDLE_UP_AND_EXIT) \ |