Mercurial > hg > truffle
diff test/Makefile @ 1902:0357ff4bd6b2
Merge
author | never |
---|---|
date | Mon, 18 Oct 2010 15:43:29 -0700 |
parents | 7aff5786cc02 |
children | 0a8e0d4345b3 |
line wrap: on
line diff
--- a/test/Makefile Mon Oct 18 09:33:24 2010 -0700 +++ b/test/Makefile Mon Oct 18 15:43:29 2010 -0700 @@ -78,7 +78,11 @@ TEST_ROOT := $(shell pwd) # Root of all test results -ABS_BUILD_ROOT = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH) +ifdef ALT_OUTPUTDIR + ABS_BUILD_ROOT = $(ALT_OUTPUTDIR)/$(PLATFORM)-$(ARCH) +else + ABS_BUILD_ROOT = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH) +endif ABS_TEST_OUTPUT_DIR = $(ABS_BUILD_ROOT)/testoutput # Expect JPRT to set PRODUCT_HOME (the product or jdk in this case to test)