comparison test/Makefile @ 7635:d754ef7b9352

Merge
author jmasa
date Thu, 24 Jan 2013 06:04:43 -0800
parents bf8c2b2c8cfa
children 393fd4ef89c4
comparison
equal deleted inserted replaced
7632:2ef7061f13b4 7635:d754ef7b9352
187 187
188 jtreg_tests: prep $(JT_HOME) $(PRODUCT_HOME) $(JTREG) 188 jtreg_tests: prep $(JT_HOME) $(PRODUCT_HOME) $(JTREG)
189 $(JTREG) -a -v:fail,error \ 189 $(JTREG) -a -v:fail,error \
190 $(JTREG_KEY_OPTION) \ 190 $(JTREG_KEY_OPTION) \
191 $(EXTRA_JTREG_OPTIONS) \ 191 $(EXTRA_JTREG_OPTIONS) \
192 -r:$(ABS_TEST_OUTPUT_DIR)/JTreport \ 192 -r:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/JTreport \
193 -w:$(ABS_TEST_OUTPUT_DIR)/JTwork \ 193 -w:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/JTwork \
194 -jdk:$(PRODUCT_HOME) \ 194 -jdk:$(shell $(GETMIXEDPATH) "$(PRODUCT_HOME)") \
195 $(JAVA_OPTIONS:%=-vmoption:%) \ 195 $(JAVA_OPTIONS:%=-vmoption:%) \
196 $(JTREG_TESTDIRS) \ 196 $(JTREG_TESTDIRS) \
197 || $(BUNDLE_UP_FAILED) 197 || $(BUNDLE_UP_FAILED)
198 $(BUNDLE_UP) 198 $(BUNDLE_UP)
199 199