equal
deleted
inserted
replaced
85 ABS_PLATFORM_BUILD_ROOT = $(ABS_OUTPUTDIR) |
85 ABS_PLATFORM_BUILD_ROOT = $(ABS_OUTPUTDIR) |
86 ABS_TEST_OUTPUT_DIR := $(ABS_PLATFORM_BUILD_ROOT)/testoutput/$(UNIQUE_DIR) |
86 ABS_TEST_OUTPUT_DIR := $(ABS_PLATFORM_BUILD_ROOT)/testoutput/$(UNIQUE_DIR) |
87 |
87 |
88 # Expect JPRT to set PRODUCT_HOME (the product or jdk in this case to test) |
88 # Expect JPRT to set PRODUCT_HOME (the product or jdk in this case to test) |
89 ifndef PRODUCT_HOME |
89 ifndef PRODUCT_HOME |
90 # Try to use j2sdk-image if it exists |
90 # Try to use images/jdk if it exists |
91 ABS_JDK_IMAGE = $(ABS_PLATFORM_BUILD_ROOT)/images/j2sdk-image |
91 ABS_JDK_IMAGE = $(ABS_PLATFORM_BUILD_ROOT)/images/jdk |
92 PRODUCT_HOME := \ |
92 PRODUCT_HOME := \ |
93 $(shell \ |
93 $(shell \ |
94 if [ -d $(ABS_JDK_IMAGE) ] ; then \ |
94 if [ -d $(ABS_JDK_IMAGE) ] ; then \ |
95 $(ECHO) "$(ABS_JDK_IMAGE)"; \ |
95 $(ECHO) "$(ABS_JDK_IMAGE)"; \ |
96 else \ |
96 else \ |
232 |
232 |
233 # jtreg tests |
233 # jtreg tests |
234 |
234 |
235 # Expect JT_HOME to be set for jtreg tests. (home for jtreg) |
235 # Expect JT_HOME to be set for jtreg tests. (home for jtreg) |
236 ifndef JT_HOME |
236 ifndef JT_HOME |
237 JT_HOME = $(SLASH_JAVA)/re/jtreg/4.1/promoted/latest/binaries/jtreg |
237 JT_HOME = $(SLASH_JAVA)/re/jtreg/4.2/promoted/latest/binaries/jtreg |
238 ifdef JPRT_JTREG_HOME |
238 ifdef JPRT_JTREG_HOME |
239 JT_HOME = $(JPRT_JTREG_HOME) |
239 JT_HOME = $(JPRT_JTREG_HOME) |
240 endif |
240 endif |
241 endif |
241 endif |
242 |
242 |