equal
deleted
inserted
replaced
84 endif |
84 endif |
85 |
85 |
86 # Default JTREG to run |
86 # Default JTREG to run |
87 ifdef JPRT_JTREG_HOME |
87 ifdef JPRT_JTREG_HOME |
88 JTREG_HOME = $(JPRT_JTREG_HOME) |
88 JTREG_HOME = $(JPRT_JTREG_HOME) |
|
89 else ifdef JT_HOME |
|
90 JTREG_HOME = $(JT_HOME) |
89 else |
91 else |
90 JTREG_HOME = $(SLASH_JAVA)/re/jtreg/4.1-jigsaw/nightly/binaries/jtreg/ |
92 JTREG_HOME = $(SLASH_JAVA)/re/jtreg/4.1-jigsaw/nightly/binaries/jtreg/ |
91 endif |
93 endif |
92 JTREG = $(JTREG_HOME)/bin/jtreg |
94 JTREG = $(JTREG_HOME)/bin/jtreg |
93 JTDIFF = $(JTREG_HOME)/bin/jtdiff |
95 JTDIFF = $(JTREG_HOME)/bin/jtdiff |
111 |
113 |
112 # Default JDK for JTREG and JCK |
114 # Default JDK for JTREG and JCK |
113 # |
115 # |
114 # JT_JAVA is the version of java used to run jtreg/JCK. |
116 # JT_JAVA is the version of java used to run jtreg/JCK. |
115 # |
117 # |
116 ifdef JPRT_JAVA_HOME |
118 ifndef JT_JAVA |
117 JT_JAVA = $(JPRT_JAVA_HOME) |
119 ifdef JPRT_JAVA_HOME |
118 else |
120 JT_JAVA = $(JPRT_JAVA_HOME) |
119 JT_JAVA = $(SLASH_JAVA)/re/jdk/1.9.0/archive/fcs/binaries/$(PLATFORM)-$(ARCH) |
121 else |
|
122 JT_JAVA = $(SLASH_JAVA)/re/jdk/1.9.0/archive/fcs/binaries/$(PLATFORM)-$(ARCH) |
|
123 endif |
120 endif |
124 endif |
121 |
125 |
122 # Default JDK to test |
126 # Default JDK to test |
123 ifdef JPRT_IMPORT_PRODUCT_HOME |
127 ifdef JPRT_IMPORT_PRODUCT_HOME |
124 TESTJAVA = $(JPRT_IMPORT_PRODUCT_HOME) |
128 TESTJAVA = $(JPRT_IMPORT_PRODUCT_HOME) |
145 ### In the following, -refvmoptions is an undocumented option |
149 ### In the following, -refvmoptions is an undocumented option |
146 ### The following does not work JCK 7 b30 2/6/2010. Awaiting b31. |
150 ### The following does not work JCK 7 b30 2/6/2010. Awaiting b31. |
147 JCK_OPTIONS += \ |
151 JCK_OPTIONS += \ |
148 -vmoptions:-Xbootclasspath/p:$(TESTBOOTCLASSPATH) \ |
152 -vmoptions:-Xbootclasspath/p:$(TESTBOOTCLASSPATH) \ |
149 -refvmoptions:-Xbootclasspath/p:$(TESTBOOTCLASSPATH) |
153 -refvmoptions:-Xbootclasspath/p:$(TESTBOOTCLASSPATH) |
|
154 endif |
|
155 |
|
156 ifdef EXTRA_JTREG_OPTIONS |
|
157 JTREG_OPTIONS += $(EXTRA_JTREG_OPTIONS) |
150 endif |
158 endif |
151 |
159 |
152 # Concurrency is the number of tests that can execute at once. |
160 # Concurrency is the number of tests that can execute at once. |
153 # On an otherwise empty machine, suggest setting to (#cpus + 2) |
161 # On an otherwise empty machine, suggest setting to (#cpus + 2) |
154 # If unset, the default is (#cpus) |
162 # If unset, the default is (#cpus) |
259 javac: JTREG_TESTDIRS = tools/javac |
267 javac: JTREG_TESTDIRS = tools/javac |
260 javadoc: JTREG_TESTDIRS = tools/javadoc com/sun/javadoc |
268 javadoc: JTREG_TESTDIRS = tools/javadoc com/sun/javadoc |
261 javah: JTREG_TESTDIRS = tools/javah |
269 javah: JTREG_TESTDIRS = tools/javah |
262 javap: JTREG_TESTDIRS = tools/javap |
270 javap: JTREG_TESTDIRS = tools/javap |
263 jdeps: JTREG_TESTDIRS = tools/jdeps |
271 jdeps: JTREG_TESTDIRS = tools/jdeps |
|
272 |
|
273 # a way to select jtreg tests from outside |
|
274 ifdef TEST_SELECTION |
|
275 JTREG_TESTDIRS = $(TEST_SELECTION) |
|
276 endif |
|
277 |
264 |
278 |
265 # Run jtreg tests |
279 # Run jtreg tests |
266 # |
280 # |
267 # JTREG_HOME |
281 # JTREG_HOME |
268 # Installed location of jtreg |
282 # Installed location of jtreg |
288 @mkdir -p $(JTREG_OUTPUT_DIR) |
302 @mkdir -p $(JTREG_OUTPUT_DIR) |
289 JT_JAVA=$(JT_JAVA) $(JTREG) \ |
303 JT_JAVA=$(JT_JAVA) $(JTREG) \ |
290 -J-Xmx512m \ |
304 -J-Xmx512m \ |
291 -vmoption:-Xmx768m \ |
305 -vmoption:-Xmx768m \ |
292 -a -ignore:quiet $(if $(JTREG_VERBOSE),-v:$(JTREG_VERBOSE)) \ |
306 -a -ignore:quiet $(if $(JTREG_VERBOSE),-v:$(JTREG_VERBOSE)) \ |
293 -r:$(JTREG_OUTPUT_DIR)/JTreport \ |
307 -r:$(JTREG_OUTPUT_DIR)/JTreport \ |
294 -w:$(JTREG_OUTPUT_DIR)/JTwork \ |
308 -w:$(JTREG_OUTPUT_DIR)/JTwork \ |
295 -jdk:$(TESTJAVA) \ |
309 -jdk:$(TESTJAVA) \ |
296 $(JAVA_ARGS:%=-vmoption:%) \ |
310 $(JAVA_ARGS:%=-vmoption:%) \ |
297 $(JTREG_EXCLUSIONS) \ |
311 $(JTREG_EXCLUSIONS) \ |
298 $(JTREG_OPTIONS) \ |
312 $(JTREG_OPTIONS) \ |
299 $(JTREG_TESTDIRS) \ |
313 $(JTREG_TESTDIRS) \ |
300 || ( $(call EXIT_IF_FATAL,$(FATAL_JTREG_EXIT)) ; \ |
314 || ( $(call EXIT_IF_FATAL,$(FATAL_JTREG_EXIT)) ; \ |
301 echo $$status > $(JTREG_OUTPUT_DIR)/status.txt \ |
315 echo $$status > $(JTREG_OUTPUT_DIR)/status.txt \ |
302 ) |
316 ) |
303 ifdef JTREG_REFERENCE |
317 ifdef JTREG_REFERENCE |
304 JT_JAVA=$(JT_JAVA) $(JTDIFF) -o $(JTREG_OUTPUT_DIR)/diff.html \ |
318 JT_JAVA=$(JT_JAVA) $(JTDIFF) -o $(JTREG_OUTPUT_DIR)/diff.html \ |