# HG changeset patch
# User iignatyev
# Date 1481110655 -10800
# Node ID 713bd5476acc32d7752efaa068b6325f21c0e6de
# Parent  ccaca70e893cc923e7f52c07f4728c22460fcf5c
8078450: Implement consistent process for quarantine of tests
Reviewed-by: dfazunen, dholmes, sspitsyn, phh

diff -r ccaca70e893c -r 713bd5476acc test/Makefile
--- a/test/Makefile	Tue Mar 12 10:43:27 2019 +0100
+++ b/test/Makefile	Wed Dec 07 14:37:35 2016 +0300
@@ -250,6 +250,21 @@
   endif
 endif
 
+# Problematic tests to be excluded
+PROBLEM_LISTS=$(call MixedDirs,$(wildcard ProblemList.txt closed/ProblemList.txt))
+
+# Create exclude list for this platform and arch
+ifdef NO_EXCLUDES
+  JTREG_EXCLUSIONS =
+else
+  JTREG_EXCLUSIONS = $(PROBLEM_LISTS:%=-exclude:%)
+endif
+
+# convert list of directories to dos paths
+define MixedDirs
+$(foreach i,$1,$(shell $(GETMIXEDPATH) "${i}"))
+endef
+
 # When called from JPRT the TESTDIRS variable is set to the jtreg tests to run
 ifdef TESTDIRS
   TEST_SELECTION = $(TESTDIRS)
@@ -278,14 +293,6 @@
 # Set other vm and test options
 JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_OPTIONS:%=-vmoption:%) $(JAVA_VM_ARGS:%=-vmoption:%)
 
-# Option to tell jtreg to not run tests marked with "ignore"
-ifeq ($(PLATFORM), windows)
-  JTREG_KEY_OPTION = -k:!ignore
-else
-  JTREG_KEY_OPTION = -k:\!ignore
-endif
-JTREG_BASIC_OPTIONS += $(JTREG_KEY_OPTION)
- 
 # Make sure jtreg exists
 $(JTREG): $(JT_HOME)
 
diff -r ccaca70e893c -r 713bd5476acc test/ProblemList.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/ProblemList.txt	Wed Dec 07 14:37:35 2016 +0300
@@ -0,0 +1,52 @@
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#############################################################################
+#
+# List of quarantined tests -- tests that should not be run by default, because
+# they may fail due to known reason. The reason (CR#) must be mandatory specified.
+#
+# List items are testnames followed by labels, all MUST BE commented
+#   as to why they are here and use a label:
+#     generic-all   Problems on all platforms
+#     generic-ARCH  Where ARCH is one of: sparc, sparcv9, x64, i586, etc.
+#     OSNAME-all    Where OSNAME is one of: solaris, linux, windows, macosx, aix
+#     OSNAME-ARCH   Specific on to one OSNAME and ARCH, e.g. solaris-amd64
+#     OSNAME-REV    Specific on to one OSNAME and REV, e.g. solaris-5.8
+#
+# More than one label is allowed but must be on the same line.
+#
+#############################################################################
+
+# :hotspot_runtime
+
+runtime/SharedArchiveFile/SharedBaseAddress.java 8044600 solaris-sparc
+runtime/6929067/Test6929067.sh 8028740 generic-all
+runtime/CDSCompressedKPtrs/XShareAuto.java 8026154 generic-all
+runtime/XCheckJniJsig/XCheckJSig.java 8023735 generic-all
+runtime/6626217/Test6626217.sh 8028733 generic-all
+runtime/jsig/Test8017498.sh 8028806 generic-all
+runtime/LoadClass/LoadClassNegative.java 8028095 generic-all
+runtime/NMT/MallocStressTest.java 8166548 generic-all
+runtime/InitialThreadOverflow/testme.sh 8029139 generic-all
+runtime/memory/ReadFromNoaccessArea.java 8028398 generic-all
diff -r ccaca70e893c -r 713bd5476acc test/runtime/6626217/Test6626217.sh
--- a/test/runtime/6626217/Test6626217.sh	Tue Mar 12 10:43:27 2019 +0100
+++ b/test/runtime/6626217/Test6626217.sh	Wed Dec 07 14:37:35 2016 +0300
@@ -22,7 +22,6 @@
 # 
 
 
-# @ignore 8028733
 # @test @(#)Test6626217.sh
 # @bug 6626217
 # @summary Loader-constraint table allows arrays instead of only the base-classes
diff -r ccaca70e893c -r 713bd5476acc test/runtime/6929067/Test6929067.sh
--- a/test/runtime/6929067/Test6929067.sh	Tue Mar 12 10:43:27 2019 +0100
+++ b/test/runtime/6929067/Test6929067.sh	Wed Dec 07 14:37:35 2016 +0300
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 ##
-## @ignore 8028740
 ## @test Test6929067.sh
 ## @bug 6929067
 ## @bug 8021296
diff -r ccaca70e893c -r 713bd5476acc test/runtime/CDSCompressedKPtrs/XShareAuto.java
--- a/test/runtime/CDSCompressedKPtrs/XShareAuto.java	Tue Mar 12 10:43:27 2019 +0100
+++ b/test/runtime/CDSCompressedKPtrs/XShareAuto.java	Wed Dec 07 14:37:35 2016 +0300
@@ -22,7 +22,6 @@
  */
 
 /*
- * @ignore 8026154
  * @test
  * @bug 8005933
  * @summary Test that -Xshare:auto uses CDS when explicitly specified with -server.
diff -r ccaca70e893c -r 713bd5476acc test/runtime/InitialThreadOverflow/testme.sh
--- a/test/runtime/InitialThreadOverflow/testme.sh	Tue Mar 12 10:43:27 2019 +0100
+++ b/test/runtime/InitialThreadOverflow/testme.sh	Wed Dec 07 14:37:35 2016 +0300
@@ -21,7 +21,6 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 
-# @ignore 8029139
 # @test testme.sh
 # @bug 8009062
 # @summary Poor performance of JNI AttachCurrentThread after fix for 7017193
diff -r ccaca70e893c -r 713bd5476acc test/runtime/LoadClass/LoadClassNegative.java
--- a/test/runtime/LoadClass/LoadClassNegative.java	Tue Mar 12 10:43:27 2019 +0100
+++ b/test/runtime/LoadClass/LoadClassNegative.java	Wed Dec 07 14:37:35 2016 +0300
@@ -22,7 +22,6 @@
  */
 
 /*
- * @ignore 8028095
  * @test
  * @key regression
  * @bug 8020675
diff -r ccaca70e893c -r 713bd5476acc test/runtime/NMT/MallocStressTest.java
--- a/test/runtime/NMT/MallocStressTest.java	Tue Mar 12 10:43:27 2019 +0100
+++ b/test/runtime/NMT/MallocStressTest.java	Wed Dec 07 14:37:35 2016 +0300
@@ -27,7 +27,6 @@
  * @key nmt jcmd stress
  * @library /testlibrary /testlibrary/whitebox
  * @build MallocStressTest
- * @ignore - This test is disabled since it will stress NMT and timeout during normal testing
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocStressTest
  */
diff -r ccaca70e893c -r 713bd5476acc test/runtime/SharedArchiveFile/SharedBaseAddress.java
--- a/test/runtime/SharedArchiveFile/SharedBaseAddress.java	Tue Mar 12 10:43:27 2019 +0100
+++ b/test/runtime/SharedArchiveFile/SharedBaseAddress.java	Wed Dec 07 14:37:35 2016 +0300
@@ -41,8 +41,6 @@
     };
 
     public static void main(String[] args) throws Exception {
-        // Known issue on Solaris-Sparc
-        // @ignore JDK-8044600
         if (Platform.isSolaris() && Platform.isSparc())
             return;
 
diff -r ccaca70e893c -r 713bd5476acc test/runtime/XCheckJniJsig/XCheckJSig.java
--- a/test/runtime/XCheckJniJsig/XCheckJSig.java	Tue Mar 12 10:43:27 2019 +0100
+++ b/test/runtime/XCheckJniJsig/XCheckJSig.java	Wed Dec 07 14:37:35 2016 +0300
@@ -22,7 +22,6 @@
  */
 
 /*
- * @ignore 8023735
  * @test
  * @bug 7051189 8023393
  * @summary Need to suppress info message if -Xcheck:jni is used with libjsig.so
diff -r ccaca70e893c -r 713bd5476acc test/runtime/jsig/Test8017498.sh
--- a/test/runtime/jsig/Test8017498.sh	Tue Mar 12 10:43:27 2019 +0100
+++ b/test/runtime/jsig/Test8017498.sh	Wed Dec 07 14:37:35 2016 +0300
@@ -24,7 +24,6 @@
 #
 
 ##
-## @ignore 8028806
 ## @test Test8017498.sh
 ## @bug 8017498
 ## @bug 8020791
diff -r ccaca70e893c -r 713bd5476acc test/runtime/memory/ReadFromNoaccessArea.java
--- a/test/runtime/memory/ReadFromNoaccessArea.java	Tue Mar 12 10:43:27 2019 +0100
+++ b/test/runtime/memory/ReadFromNoaccessArea.java	Wed Dec 07 14:37:35 2016 +0300
@@ -22,7 +22,6 @@
  */
 
 /*
- * @ignore 8028398
  * @test
  * @summary Test that touching noaccess area in class ReservedHeapSpace results in SIGSEGV/ACCESS_VIOLATION
  * @library /testlibrary /testlibrary/whitebox