test/Makefile

@  rev 9017 : 8222737: [TESTBUG] Allow for tier 1 like testing in OpenJDK 8u
|  Reviewed-by: adinn, shade
~

*** 117,131 ****
  # 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)/$(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)
  ifndef PRODUCT_HOME
    # Try to use j2sdk-image if it exists
    ABS_JDK_IMAGE = $(ABS_BUILD_ROOT)/j2sdk-image
--- 117,131 ----
  # 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
*** 265,275 ****
  # Use agent mode
  JTREG_BASIC_OPTIONS += -agentvm
  # Only run automatic tests
  JTREG_BASIC_OPTIONS += -a
  # Report details on all failed or error tests, times too
! JTREG_BASIC_OPTIONS += -v:fail,error,time
  # Retain all files for failing tests
  JTREG_BASIC_OPTIONS += -retain:fail,error
  # Ignore tests are not run and completely silent about it
  JTREG_IGNORE_OPTION = -ignore:quiet
  JTREG_BASIC_OPTIONS += $(JTREG_IGNORE_OPTION)
--- 265,275 ----
  # Use agent mode
  JTREG_BASIC_OPTIONS += -agentvm
  # Only run automatic tests
  JTREG_BASIC_OPTIONS += -a
  # Report details on all failed or error tests, times too
! JTREG_BASIC_OPTIONS += -v:fail,error,summary
  # Retain all files for failing tests
  JTREG_BASIC_OPTIONS += -retain:fail,error
  # Ignore tests are not run and completely silent about it
  JTREG_IGNORE_OPTION = -ignore:quiet
  JTREG_BASIC_OPTIONS += $(JTREG_IGNORE_OPTION)