hotspot/test/Makefile

*** 118,133 ****
  
  # Root of this test area (important to use full paths in some places)
  TEST_ROOT := $(shell pwd)
  
  # Root of all test results
! ifdef ALT_OUTPUTDIR
!   ABS_BUILD_ROOT = $(ALT_OUTPUTDIR)
  else
    ABS_BUILD_ROOT = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)
  endif
- 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
    # Try to use j2sdk-image if it exists
    ABS_JDK_IMAGE = $(ABS_BUILD_ROOT)/j2sdk-image
--- 118,139 ----
  
  # Root of this test area (important to use full paths in some places)
  TEST_ROOT := $(shell pwd)
  
  # Root of all test results
! ifdef TEST_OUTPUT_DIR
!   $(shell $(MKDIR) -p $(TEST_OUTPUT_DIR)/jtreg)
!   ABS_TEST_OUTPUT_DIR := \
!     $(shell $(CD) $(TEST_OUTPUT_DIR)/jtreg && $(PWD))
  else
+   ifdef ALT_OUTPUTDIR
+     ABS_BUILD_ROOT = $(ALT_OUTPUTDIR)
+   else
      ABS_BUILD_ROOT = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)
+   endif
+   ABS_TEST_OUTPUT_DIR = $(ABS_BUILD_ROOT)/testoutput/$(UNIQUE_DIR)
  endif
  
  # Expect JPRT to set PRODUCT_HOME (the product or jdk in this case to test)
  ifndef PRODUCT_HOME
    # Try to use j2sdk-image if it exists
    ABS_JDK_IMAGE = $(ABS_BUILD_ROOT)/j2sdk-image