1.1 --- a/test/Makefile Tue Mar 20 19:36:59 2012 -0700
1.2 +++ b/test/Makefile Wed Mar 21 08:34:23 2012 +0100
1.3 @@ -26,6 +26,8 @@
1.4 # Makefile to run various jdk tests
1.5 #
1.6
1.7 +GETMIXEDPATH=echo
1.8 +
1.9 # Get OS/ARCH specifics
1.10 OSNAME = $(shell uname -s)
1.11 ifeq ($(OSNAME), SunOS)
1.12 @@ -60,7 +62,14 @@
1.13 ARCH = i586
1.14 endif
1.15 endif
1.16 -ifeq ($(OSNAME), Windows_NT)
1.17 +ifeq ($(PLATFORM),)
1.18 + # detect wether we're running in MKS or cygwin
1.19 + ifeq ($(OSNAME), Windows_NT) # MKS
1.20 + GETMIXEDPATH=dosname -s
1.21 + endif
1.22 + ifeq ($(findstring CYGWIN,$(OSNAME)), CYGWIN)
1.23 + GETMIXEDPATH=cygpath -m -s
1.24 + endif
1.25 PLATFORM = windows
1.26 SLASH_JAVA = J:
1.27 ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),ia64)
1.28 @@ -234,11 +243,11 @@
1.29 $(JTREG) -a -v:fail,error \
1.30 $(JTREG_KEY_OPTION) \
1.31 $(EXTRA_JTREG_OPTIONS) \
1.32 - -r:$(ABS_TEST_OUTPUT_DIR)/JTreport \
1.33 - -w:$(ABS_TEST_OUTPUT_DIR)/JTwork \
1.34 - -jdk:$(PRODUCT_HOME) \
1.35 + -r:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/JTreport \
1.36 + -w:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/JTwork \
1.37 + -jdk:$(shell $(GETMIXEDPATH) "$(PRODUCT_HOME)") \
1.38 $(JAVA_OPTIONS:%=-vmoption:%) \
1.39 - $(TEST_ROOT)/sanity \
1.40 + $(shell $(GETMIXEDPATH) "$(TEST_ROOT)")/sanity \
1.41 || $(BUNDLE_UP_FAILED)
1.42 $(BUNDLE_UP)
1.43
