# HG changeset patch
# User ehelin
# Date 1453140632 -3600
# Node ID 7dc2870c3171fda5b8f7d041a3b68cd15756aba1
# Parent  4ec07c1548985aa5434c72cb04268759a1ad18f0# Parent  b0a52e3dd4749239460ce211141b9f2849da551a
Merge

diff -r 4ec07c154898 -r 7dc2870c3171 hotspot/test/Makefile
--- a/hotspot/test/Makefile	Mon Jan 18 17:53:34 2016 +0100
+++ b/hotspot/test/Makefile	Mon Jan 18 19:10:32 2016 +0100
@@ -121,11 +121,11 @@
 
 # Root of all test results
 ifdef ALT_OUTPUTDIR
-  ABS_BUILD_ROOT = $(ALT_OUTPUTDIR)/$(PLATFORM)-$(ARCH)
+  ABS_BUILD_ROOT = $(ALT_OUTPUTDIR)
 else
   ABS_BUILD_ROOT = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)
 endif
-ABS_TEST_OUTPUT_DIR = $(ABS_BUILD_ROOT)/testoutput
+ABS_TEST_OUTPUT_DIR = $(ABS_BUILD_ROOT)/testoutput/$(UNIQUE_DIR)
 
 # Expect JPRT to set PRODUCT_HOME (the product or jdk in this case to test)
 ifndef PRODUCT_HOME