58 ARCH = $(shell uname -m) |
60 ARCH = $(shell uname -m) |
59 ifeq ($(ARCH), i386) |
61 ifeq ($(ARCH), i386) |
60 ARCH = i586 |
62 ARCH = i586 |
61 endif |
63 endif |
62 endif |
64 endif |
63 ifeq ($(OSNAME), Windows_NT) |
65 ifeq ($(PLATFORM),) |
|
66 # detect wether we're running in MKS or cygwin |
|
67 ifeq ($(OSNAME), Windows_NT) # MKS |
|
68 GETMIXEDPATH=dosname -s |
|
69 endif |
|
70 ifeq ($(findstring CYGWIN,$(OSNAME)), CYGWIN) |
|
71 GETMIXEDPATH=cygpath -m -s |
|
72 endif |
64 PLATFORM = windows |
73 PLATFORM = windows |
65 SLASH_JAVA = J: |
74 SLASH_JAVA = J: |
66 ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),ia64) |
75 ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),ia64) |
67 ARCH = ia64 |
76 ARCH = ia64 |
68 else |
77 else |
232 |
241 |
233 wbapitest: prep $(JT_HOME) $(PRODUCT_HOME) $(JTREG) |
242 wbapitest: prep $(JT_HOME) $(PRODUCT_HOME) $(JTREG) |
234 $(JTREG) -a -v:fail,error \ |
243 $(JTREG) -a -v:fail,error \ |
235 $(JTREG_KEY_OPTION) \ |
244 $(JTREG_KEY_OPTION) \ |
236 $(EXTRA_JTREG_OPTIONS) \ |
245 $(EXTRA_JTREG_OPTIONS) \ |
237 -r:$(ABS_TEST_OUTPUT_DIR)/JTreport \ |
246 -r:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/JTreport \ |
238 -w:$(ABS_TEST_OUTPUT_DIR)/JTwork \ |
247 -w:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/JTwork \ |
239 -jdk:$(PRODUCT_HOME) \ |
248 -jdk:$(shell $(GETMIXEDPATH) "$(PRODUCT_HOME)") \ |
240 $(JAVA_OPTIONS:%=-vmoption:%) \ |
249 $(JAVA_OPTIONS:%=-vmoption:%) \ |
241 $(TEST_ROOT)/sanity \ |
250 $(shell $(GETMIXEDPATH) "$(TEST_ROOT)")/sanity \ |
242 || $(BUNDLE_UP_FAILED) |
251 || $(BUNDLE_UP_FAILED) |
243 $(BUNDLE_UP) |
252 $(BUNDLE_UP) |
244 |
253 |
245 PHONY_LIST += wbapitest |
254 PHONY_LIST += wbapitest |
246 |
255 |