Mercurial > hg > truffle
comparison test/Makefile @ 1902:0357ff4bd6b2
Merge
author | never |
---|---|
date | Mon, 18 Oct 2010 15:43:29 -0700 |
parents | 7aff5786cc02 |
children | 0a8e0d4345b3 |
comparison
equal
deleted
inserted
replaced
1874:75ab0162aa84 | 1902:0357ff4bd6b2 |
---|---|
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 |