103 ARCH = x64 104 else 105 ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),EM64T) 106 ARCH = x64 107 else 108 ARCH = i586 109 endif 110 endif 111 endif 112 EXESUFFIX = .exe 113 endif 114 115 ifdef ALT_SLASH_JAVA 116 SLASH_JAVA = $(ALT_SLASH_JAVA) 117 endif 118 119 # Root of this test area (important to use full paths in some places) 120 TEST_ROOT := $(shell pwd) 121 122 # Root of all test results 123 ifdef ALT_OUTPUTDIR 124 ABS_BUILD_ROOT = $(ALT_OUTPUTDIR) 125 else 126 ABS_BUILD_ROOT = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH) 127 endif 128 ABS_TEST_OUTPUT_DIR = $(ABS_BUILD_ROOT)/testoutput/$(UNIQUE_DIR) 129 130 # Expect JPRT to set PRODUCT_HOME (the product or jdk in this case to test) 131 ifndef PRODUCT_HOME 132 # Try to use j2sdk-image if it exists 133 ABS_JDK_IMAGE = $(ABS_BUILD_ROOT)/j2sdk-image 134 PRODUCT_HOME := \ 135 $(shell \ 136 if [ -d $(ABS_JDK_IMAGE) ] ; then \ 137 $(ECHO) "$(ABS_JDK_IMAGE)"; \ 138 else \ 139 $(ECHO) "$(ABS_BUILD_ROOT)" ; \ 140 fi) 141 endif 142 143 # Expect JPRT to set JAVA_ARGS (e.g. -server etc.) 144 JAVA_OPTIONS = 145 ifdef JAVA_ARGS 146 JAVA_OPTIONS = $(JAVA_ARGS) 147 endif 148 | 103 ARCH = x64 104 else 105 ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),EM64T) 106 ARCH = x64 107 else 108 ARCH = i586 109 endif 110 endif 111 endif 112 EXESUFFIX = .exe 113 endif 114 115 ifdef ALT_SLASH_JAVA 116 SLASH_JAVA = $(ALT_SLASH_JAVA) 117 endif 118 119 # Root of this test area (important to use full paths in some places) 120 TEST_ROOT := $(shell pwd) 121 122 # Root of all test results 123 ifdef TEST_OUTPUT_DIR 124 $(shell $(MKDIR) -p $(TEST_OUTPUT_DIR)/jtreg) 125 ABS_TEST_OUTPUT_DIR := \ 126 $(shell $(CD) $(TEST_OUTPUT_DIR)/jtreg && $(PWD)) 127 else 128 ifdef ALT_OUTPUTDIR 129 ABS_BUILD_ROOT = $(ALT_OUTPUTDIR) 130 else 131 ABS_BUILD_ROOT = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH) 132 endif 133 ABS_TEST_OUTPUT_DIR = $(ABS_BUILD_ROOT)/testoutput/$(UNIQUE_DIR) 134 endif 135 136 # Expect JPRT to set PRODUCT_HOME (the product or jdk in this case to test) 137 ifndef PRODUCT_HOME 138 # Try to use j2sdk-image if it exists 139 ABS_JDK_IMAGE = $(ABS_BUILD_ROOT)/j2sdk-image 140 PRODUCT_HOME := \ 141 $(shell \ 142 if [ -d $(ABS_JDK_IMAGE) ] ; then \ 143 $(ECHO) "$(ABS_JDK_IMAGE)"; \ 144 else \ 145 $(ECHO) "$(ABS_BUILD_ROOT)" ; \ 146 fi) 147 endif 148 149 # Expect JPRT to set JAVA_ARGS (e.g. -server etc.) 150 JAVA_OPTIONS = 151 ifdef JAVA_ARGS 152 JAVA_OPTIONS = $(JAVA_ARGS) 153 endif 154 |