equal
deleted
inserted
replaced
74 |
74 |
75 # Root of this test area (important to use full paths in some places) |
75 # Root of this test area (important to use full paths in some places) |
76 TEST_ROOT := $(shell $(PWD)) |
76 TEST_ROOT := $(shell $(PWD)) |
77 |
77 |
78 # Root of all test results |
78 # Root of all test results |
79 ifdef ALT_OUTPUTDIR |
79 ifdef TEST_OUTPUT_DIR |
80 ABS_OUTPUTDIR = $(shell $(CD) $(ALT_OUTPUTDIR) && $(PWD)) |
80 $(shell $(MKDIR) -p $(TEST_OUTPUT_DIR)/jtreg) |
|
81 ABS_TEST_OUTPUT_DIR := \ |
|
82 $(shell $(CD) $(TEST_OUTPUT_DIR)/jtreg && $(PWD)) |
81 else |
83 else |
82 ABS_OUTPUTDIR = $(shell $(CD) $(TEST_ROOT)/.. && $(PWD)) |
84 ifdef ALT_OUTPUTDIR |
83 endif |
85 ABS_OUTPUTDIR = $(shell $(CD) $(ALT_OUTPUTDIR) && $(PWD)) |
84 |
86 else |
85 ABS_PLATFORM_BUILD_ROOT = $(ABS_OUTPUTDIR) |
87 ABS_OUTPUTDIR = $(shell $(CD) $(TEST_ROOT)/.. && $(PWD)) |
86 ABS_TEST_OUTPUT_DIR := $(ABS_PLATFORM_BUILD_ROOT)/testoutput/$(UNIQUE_DIR) |
88 endif |
|
89 |
|
90 ABS_PLATFORM_BUILD_ROOT = $(ABS_OUTPUTDIR) |
|
91 ABS_TEST_OUTPUT_DIR := $(ABS_PLATFORM_BUILD_ROOT)/testoutput/$(UNIQUE_DIR) |
|
92 endif |
87 |
93 |
88 # Expect JPRT to set PRODUCT_HOME (the product or jdk in this case to test) |
94 # Expect JPRT to set PRODUCT_HOME (the product or jdk in this case to test) |
89 ifndef PRODUCT_HOME |
95 ifndef PRODUCT_HOME |
90 # Try to use j2sdk-image if it exists |
96 # Try to use j2sdk-image if it exists |
91 ABS_JDK_IMAGE = $(ABS_PLATFORM_BUILD_ROOT)/images/j2sdk-image |
97 ABS_JDK_IMAGE = $(ABS_PLATFORM_BUILD_ROOT)/images/j2sdk-image |