equal
deleted
inserted
replaced
155 JCK_OPTIONS += \ |
155 JCK_OPTIONS += \ |
156 -vmoptions:-Xbootclasspath/p:$(TESTBOOTCLASSPATH) \ |
156 -vmoptions:-Xbootclasspath/p:$(TESTBOOTCLASSPATH) \ |
157 -refvmoptions:-Xbootclasspath/p:$(TESTBOOTCLASSPATH) |
157 -refvmoptions:-Xbootclasspath/p:$(TESTBOOTCLASSPATH) |
158 endif |
158 endif |
159 |
159 |
160 ifeq ($(ARCH_DATA_MODEL),32) |
|
161 # Set the GC options for test vms |
|
162 JTREG_GC_OPTION = -vmoption:-XX:+UseSerialGC |
|
163 JTREG_OPTIONS += $(JTREG_GC_OPTION) |
|
164 endif |
|
165 # Set the max memory for jtreg target test JVMs |
160 # Set the max memory for jtreg target test JVMs |
166 JTREG_TESTVM_MEMORY_OPTION = -vmoption:-Xmx768m |
161 JTREG_TESTVM_MEMORY_OPTION = -vmoption:-Xmx768m |
167 JTREG_OPTIONS += $(JTREG_TESTVM_MEMORY_OPTION) |
162 JTREG_OPTIONS += $(JTREG_TESTVM_MEMORY_OPTION) |
168 |
163 |
169 ifdef EXTRA_JTREG_OPTIONS |
164 ifdef EXTRA_JTREG_OPTIONS |
253 pwd $(CYGPATH)) |
248 pwd $(CYGPATH)) |
254 # Subdirectories for different test runs |
249 # Subdirectories for different test runs |
255 JTREG_OUTPUT_DIR = $(ABS_TEST_OUTPUT_DIR)/jtreg |
250 JTREG_OUTPUT_DIR = $(ABS_TEST_OUTPUT_DIR)/jtreg |
256 JCK_COMPILER_OUTPUT_DIR = $(ABS_TEST_OUTPUT_DIR)/jck-compiler |
251 JCK_COMPILER_OUTPUT_DIR = $(ABS_TEST_OUTPUT_DIR)/jck-compiler |
257 JCK_RUNTIME_OUTPUT_DIR = $(ABS_TEST_OUTPUT_DIR)/jck-runtime-Xcompile |
252 JCK_RUNTIME_OUTPUT_DIR = $(ABS_TEST_OUTPUT_DIR)/jck-runtime-Xcompile |
|
253 |
|
254 # Is the test JVM 32-bit? |
|
255 DATA_MODEL := \ |
|
256 $(shell $(JT_JAVA)/bin/java -XshowSettings:properties -version 2>&1 | \ |
|
257 grep 'sun\.arch\.data\.model' | \ |
|
258 awk '{print $$3}') |
|
259 ifeq ($(DATA_MODEL), 32) |
|
260 # Set the GC options for test vms having a smaller address space |
|
261 JTREG_GC_OPTION = -vmoption:-XX:+UseSerialGC |
|
262 JTREG_OPTIONS += $(JTREG_GC_OPTION) |
|
263 endif |
258 |
264 |
259 # Default make rule -- warning, may take a while |
265 # Default make rule -- warning, may take a while |
260 all: $(JPRT_CLEAN) jtreg-tests jck-compiler-tests jck-runtime-tests $(JPRT_ARCHIVE_BUNDLE) all-summary |
266 all: $(JPRT_CLEAN) jtreg-tests jck-compiler-tests jck-runtime-tests $(JPRT_ARCHIVE_BUNDLE) all-summary |
261 @echo "Testing completed successfully" |
267 @echo "Testing completed successfully" |
262 |
268 |