hotspot/test/Makefile

*** 118,145 ****
  
  # 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
    PRODUCT_HOME :=                       \
      $(shell                             \
        if [ -d $(ABS_JDK_IMAGE) ] ; then \
           $(ECHO) "$(ABS_JDK_IMAGE)";    \
         else                             \
!          $(ECHO) "$(ABS_BUILD_ROOT)" ;  \
         fi)
  endif
  
  # Expect JPRT to set JAVA_ARGS (e.g. -server etc.)
  JAVA_OPTIONS =
  ifdef JAVA_ARGS
--- 118,154 ----
  
  # 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
    PRODUCT_HOME :=                                       \
      $(shell                                             \
        if [ -d $(ABS_JDK_IMAGE) ] ; then                 \
           $(ECHO) "$(ABS_JDK_IMAGE)";                    \
         else                                             \
!          $(ECHO) "$(ABS_PLATFORM_BUILD_ROOT)";          \
         fi)
+   PRODUCT_HOME := $(PRODUCT_HOME)
  endif
  
  # Expect JPRT to set JAVA_ARGS (e.g. -server etc.)
  JAVA_OPTIONS =
  ifdef JAVA_ARGS