jdk/test/Makefile

*** 74,91 ****
  
  # 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_OUTPUTDIR = $(shell $(CD) $(ALT_OUTPUTDIR) && $(PWD))
  else
    ABS_OUTPUTDIR = $(shell $(CD) $(TEST_ROOT)/.. && $(PWD))
! endif
  
! ABS_PLATFORM_BUILD_ROOT = $(ABS_OUTPUTDIR)
! ABS_TEST_OUTPUT_DIR := $(ABS_PLATFORM_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 images/jdk if it exists
    ABS_JDK_IMAGE = $(ABS_PLATFORM_BUILD_ROOT)/images/jdk
--- 74,97 ----
  
  # 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_OUTPUTDIR = $(shell $(CD) $(ALT_OUTPUTDIR) && $(PWD))
+   else
      ABS_OUTPUTDIR = $(shell $(CD) $(TEST_ROOT)/.. && $(PWD))
!   endif
  
!   ABS_PLATFORM_BUILD_ROOT = $(ABS_OUTPUTDIR)
!   ABS_TEST_OUTPUT_DIR := $(ABS_PLATFORM_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 images/jdk if it exists
    ABS_JDK_IMAGE = $(ABS_PLATFORM_BUILD_ROOT)/images/jdk