118 |
118 |
119 # Root of this test area (important to use full paths in some places) |
119 # Root of this test area (important to use full paths in some places) |
120 TEST_ROOT := $(shell pwd) |
120 TEST_ROOT := $(shell pwd) |
121 |
121 |
122 # Root of all test results |
122 # Root of all test results |
123 ifdef ALT_OUTPUTDIR |
123 ifdef TEST_OUTPUT_DIR |
124 ABS_BUILD_ROOT = $(ALT_OUTPUTDIR) |
124 $(shell $(MKDIR) -p $(TEST_OUTPUT_DIR)/jtreg) |
|
125 ABS_TEST_OUTPUT_DIR := \ |
|
126 $(shell $(CD) $(TEST_OUTPUT_DIR)/jtreg && $(PWD)) |
125 else |
127 else |
126 ABS_BUILD_ROOT = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH) |
128 ifdef ALT_OUTPUTDIR |
127 endif |
129 ABS_OUTPUTDIR = $(shell $(CD) $(ALT_OUTPUTDIR) && $(PWD)) |
128 ABS_TEST_OUTPUT_DIR = $(ABS_BUILD_ROOT)/testoutput/$(UNIQUE_DIR) |
130 else |
|
131 ABS_OUTPUTDIR = $(shell $(CD) $(TEST_ROOT)/.. && $(PWD)) |
|
132 endif |
|
133 |
|
134 ABS_PLATFORM_BUILD_ROOT = $(ABS_OUTPUTDIR) |
|
135 ABS_TEST_OUTPUT_DIR := $(ABS_PLATFORM_BUILD_ROOT)/testoutput/$(UNIQUE_DIR) |
|
136 endif |
129 |
137 |
130 # Expect JPRT to set PRODUCT_HOME (the product or jdk in this case to test) |
138 # Expect JPRT to set PRODUCT_HOME (the product or jdk in this case to test) |
131 ifndef PRODUCT_HOME |
139 ifndef PRODUCT_HOME |
132 # Try to use j2sdk-image if it exists |
140 # Try to use images/jdk if it exists |
133 ABS_JDK_IMAGE = $(ABS_BUILD_ROOT)/j2sdk-image |
141 ABS_JDK_IMAGE = $(ABS_PLATFORM_BUILD_ROOT)/images/jdk |
134 PRODUCT_HOME := \ |
142 PRODUCT_HOME := \ |
135 $(shell \ |
143 $(shell \ |
136 if [ -d $(ABS_JDK_IMAGE) ] ; then \ |
144 if [ -d $(ABS_JDK_IMAGE) ] ; then \ |
137 $(ECHO) "$(ABS_JDK_IMAGE)"; \ |
145 $(ECHO) "$(ABS_JDK_IMAGE)"; \ |
138 else \ |
146 else \ |
139 $(ECHO) "$(ABS_BUILD_ROOT)" ; \ |
147 $(ECHO) "$(ABS_PLATFORM_BUILD_ROOT)"; \ |
140 fi) |
148 fi) |
|
149 PRODUCT_HOME := $(PRODUCT_HOME) |
141 endif |
150 endif |
142 |
151 |
143 # Expect JPRT to set JAVA_ARGS (e.g. -server etc.) |
152 # Expect JPRT to set JAVA_ARGS (e.g. -server etc.) |
144 JAVA_OPTIONS = |
153 JAVA_OPTIONS = |
145 ifdef JAVA_ARGS |
154 ifdef JAVA_ARGS |