From 8ea2ed8be5beae0104e2ef45a88865d5a6ff8a70 Mon Sep 17 00:00:00 2001
From: sgehwolf <unknown>
Date: Thu, 25 Apr 2019 14:02:51 +0200
Subject: [PATCH] 8222737: [TESTBUG] Allow for tier 1 like testing in OpenJDK
 8u Reviewed-by: adinn, shade, andrew

---
 test/Makefile    | 6 +++---
 test/TEST.groups | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index e91844ece..447619b47 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -119,11 +119,11 @@ TEST_ROOT := $(shell pwd)
 
 # 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
@@ -267,7 +267,7 @@ 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
+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
diff --git a/test/TEST.groups b/test/TEST.groups
index 40750364b..216e307cf 100644
--- a/test/TEST.groups
+++ b/test/TEST.groups
@@ -124,7 +124,6 @@ compact3 = \
  -:needs_jre \
  -:needs_jdk
 
-
 # When called from top level the test suites use the hotspot_ prefix
 hotspot_wbapitest = \
   sanity/
@@ -147,6 +146,11 @@ hotspot_all = \
   :hotspot_gc \
   :hotspot_runtime \
   :hotspot_serviceability
+
+# Right now tier1 runs all hotspot tests
+hotspot_tier1 = \
+  :jdk
+
 # Tests that require compact3 API's
 #
 needs_compact3 = \
-- 
GitLab