equal
deleted
inserted
replaced
76 |
76 |
77 # Root of this test area (important to use full paths in some places) |
77 # Root of this test area (important to use full paths in some places) |
78 TEST_ROOT := $(shell pwd) |
78 TEST_ROOT := $(shell pwd) |
79 |
79 |
80 # Root of all test results |
80 # Root of all test results |
81 ABS_BUILD_ROOT = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH) |
81 ifdef ALT_OUTPUTDIR |
|
82 ABS_BUILD_ROOT = $(ALT_OUTPUTDIR)/$(PLATFORM)-$(ARCH) |
|
83 else |
|
84 ABS_BUILD_ROOT = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH) |
|
85 endif |
82 ABS_TEST_OUTPUT_DIR = $(ABS_BUILD_ROOT)/testoutput |
86 ABS_TEST_OUTPUT_DIR = $(ABS_BUILD_ROOT)/testoutput |
83 |
87 |
84 # 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) |
85 ifndef PRODUCT_HOME |
89 ifndef PRODUCT_HOME |
86 # Try to use j2sdk-image if it exists |
90 # Try to use j2sdk-image if it exists |