8176838: Remove :compact1, :compact2. :compact3, :needs_jre test groups.
Reviewed-by: alanb, dholmes
--- a/test/jdk/TEST.groups Fri Nov 17 12:09:56 2017 -0800
+++ b/test/jdk/TEST.groups Fri Nov 17 07:34:59 2017 -0800
@@ -427,442 +427,3 @@
com/sun/java/swing \
com/sun/awt
-
-###############################################################################
-# Profile-based Test Group Definitions
-#
-# These groups define the tests that cover the different possible runtimes:
-# - compact1, compact2, compact3, full JRE, JDK
-#
-# In addition they support testing of the minimal VM on compact1 and compact2.
-# Essentially this defines groups based around the specified API's and VM
-# services available in the runtime.
-#
-# The groups are defined hierarchically in two forms:
-# - The need_xxx groups list all the tests that have a dependency on
-# a specific profile. This is either because it tests a feature in
-# that profile, or the test infrastructure uses a feature in that
-# profile.
-# - The primary groups are defined in terms of the other primary groups
-# combined with the needs_xxx groups (including and excluding them as
-# appropriate). For example the jre can run all tests from compact3, plus
-# those from needs_jre, but excluding those from need_jdk.
-#
-# The bottom group defines all the actual tests to be considered, simply
-# by listing the top-level test directories.
-
-# Full JDK can run all tests
-#
-jdk = \
- :jre \
- :needs_jdk
-
-# Tests that require a full JDK to execute. Either they test a feature
-# only in the JDK or they use tools that are only in the JDK. The latter
-# can be resolved in some cases by using tools from the compile-jdk.
-#
-needs_jdk = \
- :jdk_jdi \
- com/sun/tools \
- jdk/security/jarsigner \
- sun/security/tools/jarsigner \
- sun/rmi/rmic \
- sun/tools \
- sun/jvmstat \
- tools \
- com/sun/jmx/remote/NotificationMarshalVersions/TestSerializationMismatch.java \
- java/io/Serializable/serialver \
- java/lang/invoke/lambda/LambdaAccessControlDoPrivilegedTest.java \
- java/lang/invoke/lambda/LambdaAccessControlTest.java \
- java/lang/invoke/lambda/LambdaAsm.java \
- java/lang/System/MacEncoding/TestFileEncoding.java \
- java/net/URLClassLoader/closetest/GetResourceAsStream.java \
- java/util/Collections/EmptyIterator.java \
- java/util/concurrent/locks/Lock/TimedAcquireLeak.java \
- java/util/jar/JarInputStream/ExtraFileInMetaInf.java \
- java/util/logging/TestLoggerWeakRefLeak.java \
- java/util/zip/3GBZipFiles.sh \
- jdk/lambda/separate/Compiler.java \
- sun/management/jmxremote/bootstrap/JvmstatCountersTest.java \
- sun/management/jmxremote/bootstrap/LocalManagementTest.java \
- sun/management/jmxremote/bootstrap/CustomLauncherTest.java \
- sun/misc/JarIndex/metaInfFilenames/Basic.java \
- sun/misc/JarIndex/JarIndexMergeForClassLoaderTest.java \
- jdk/internal/reflect/CallerSensitive/CallerSensitiveFinder.java \
- jdk/internal/reflect/CallerSensitive/MissingCallerSensitive.java \
- sun/security/util/Resources/NewNamesFormat.java \
- vm/verifier/defaultMethods/DefaultMethodRegressionTestsRun.java \
- javax/xml/ws/clientjar/TestWsImport.java \
- javax/xml/bind/xjc/8145039/JaxbMarshallTest.java
-
-# JRE adds further tests to compact3
-#
-jre = \
- :compact3 \
- :needs_jre \
- -:needs_jdk
-
-# Tests that require the full JRE
-#
-needs_jre = \
- :needs_charsets \
- :jdk_desktop \
- com/sun/corba \
- com/sun/jndi/cosnaming \
- com/oracle/security/ucrypto/Test8004873.java \
- com/oracle/security/ucrypto/TestAES.java \
- com/oracle/security/ucrypto/TestDigest.java \
- com/oracle/security/ucrypto/TestRSA.java \
- sun/net/ftp \
- sun/net/www/protocol/ftp \
- java/net/URI/URItoURLTest.java \
- java/net/URL/URIToURLTest.java \
- java/net/URLConnection/HandleContentTypeWithAttrs.java \
- java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh \
- java/security/Security/ClassLoaderDeadlock/Deadlock.sh \
- java/text/AttributedCharacterIterator/Attribute/ReadResolve.java \
- java/text/AttributedString/TestAttributedStringCtor.java \
- java/text/AttributedString/getRunStartLimitTest.java \
- java/util/jar/Manifest/CreateManifest.java \
- java/util/logging/TestMainAppContext.java \
- java/util/logging/TestLoggingWithMainAppContext.java \
- java/util/TimeZone/DefaultTimeZoneTest.java \
- java/text/Bidi/BidiConformance.java \
- java/text/Bidi/BidiEmbeddingTest.java \
- java/text/Bidi/Bug7042148.java \
- java/text/Bidi/Bug7051769.java \
- javax/crypto/Cipher/CipherStreamClose.java \
- javax/management/monitor/AttributeArbitraryDataTypeTest.java \
- javax/management/mxbean/AmbiguousConstructorTest.java \
- javax/management/mxbean/ExceptionDiagnosisTest.java \
- javax/management/mxbean/LeakTest.java \
- javax/management/mxbean/MXBeanTest.java \
- javax/management/mxbean/PropertyNamesTest.java \
- jdk/lambda/vm/InterfaceAccessFlagsTest.java \
- sun/misc/URLClassPath/ClassnameCharTest.java
-
-# Tests dependent on the optional charsets.jar
-# These are isolated for easy exclusions
-#
-needs_charsets = \
- -:needs_locales_and_charsets \
- java/io/OutputStreamWriter/TestWrite.java \
- java/nio/charset/RemovingSunIO/SunioAlias.java \
- java/nio/charset/coders/Check.java \
- java/nio/charset/Charset/CharsetContainmentTest.java \
- java/nio/charset/Charset/Contains.java \
- java/nio/charset/Charset/NIOCharsetAvailabilityTest.java \
- java/nio/charset/Charset/RegisteredCharsets.java \
- java/nio/charset/CharsetEncoder/Flush.java \
- java/nio/charset/coders/ResetISO2022JP.java \
- java/util/Locale/InternationalBAT.java \
- java/util/Locale/LocaleProviders.sh \
- java/util/Calendar/CldrFormatNamesTest.java \
- java/util/TimeZone/CLDRDisplayNamesTest.java \
- java/util/zip/ZipCoding.java \
- sun/nio/cs/EucJpLinux0212.java \
- sun/nio/cs/EUCJPUnderflowDecodeTest.java \
- sun/nio/cs/EuroConverter.java \
- sun/nio/cs/JISAutoDetectTest.java \
- sun/nio/cs/OLD/TestIBMDB.java \
- sun/nio/cs/SJISCanEncode.java \
- sun/nio/cs/Test6254467.java \
- sun/nio/cs/TestCp834_SBCS.java \
- sun/nio/cs/TestEUC_TW.java \
- sun/nio/cs/TestISO2022CNDecoder.java \
- sun/nio/cs/TestISO2022JPEncoder.java \
- sun/nio/cs/TestISO2022JPSubBytes.java \
- sun/nio/cs/TestIllegalSJIS.java \
- sun/nio/cs/TestJIS0208Decoder.java \
- sun/nio/cs/TestJIS0212Decoder.java \
- sun/nio/cs/TestMiscEUC_JP.java \
- sun/nio/cs/TestSJIS0213_SM.java \
- sun/nio/cs/BufferUnderflowEUCTWTest.java \
- sun/nio/cs/CheckCaseInsensitiveEncAliases.java \
- sun/nio/cs/CheckHistoricalNames.java \
- sun/nio/cs/EucJpLinuxDecoderRecoveryTest.java \
- sun/nio/cs/HWKatakanaMS932EncodeTest.java \
- sun/nio/cs/ISCIITest.java \
- sun/nio/cs/LatinCharReplacementTWTest.java \
- sun/nio/cs/NIOJISAutoDetectTest.java \
- sun/nio/cs/StreamEncoderClose.java \
- sun/nio/cs/SurrogateGB18030Test.java \
- sun/nio/cs/SurrogateTestEUCTW.java \
- sun/nio/cs/SurrogateTestHKSCS.java \
- sun/nio/cs/TestConverterDroppedCharacters.java \
- sun/nio/cs/TestCp93xSISO.java \
- sun/nio/cs/TestIBM1364.java \
- sun/nio/cs/TestIBMBugs.java \
- sun/nio/cs/TestIllegalISO2022Esc.java \
- sun/nio/cs/TestISO2022JP.java \
- sun/nio/cs/TestMS5022X.java \
- sun/nio/cs/TestSJIS0213.java \
- sun/nio/cs/TestTrailingEscapesISO2022JP.java \
- sun/nio/cs/TestUni2HKSCS.java \
- sun/nio/cs/ZeroedByteArrayEUCTWTest.java
-
-# Compact 3 adds further tests to compact2
-#
-compact3 = \
- :compact2 \
- :needs_compact3 \
- -:needs_jre \
- -:needs_jdk
-
-
-# Tests that require compact3 API's
-#
-needs_compact3 = \
- :jdk_instrument \
- :jdk_jmx \
- :jdk_management \
- :jdk_sctp \
- com/sun/jndi \
- com/sun/org/apache/xml/internal/security \
- com/sun/security/auth \
- com/sun/security/sasl \
- com/sun/security/jgss \
- java/util/prefs \
- javax/naming \
- javax/security \
- javax/smartcardio \
- javax/sql/rowset \
- javax/xml/crypto \
- sun/security/jgss \
- sun/security/krb5 \
- java/lang/annotation/AnnotationType/AnnotationTypeDeadlockTest.java \
- java/lang/invoke/lambda/LambdaStackTrace.java \
- java/lang/invoke/LFCaching/LFGarbageCollectedTest.java \
- java/lang/invoke/LFCaching/LFMultiThreadCachingTest.java \
- java/lang/invoke/LFCaching/LFSingleThreadCachingTest.java \
- java/lang/System/MacEncoding/TestFileEncoding.java \
- java/nio/channels/AsynchronousSocketChannel/Leaky.java \
- java/security/PermissionCollection/Concurrent.java \
- java/security/Principal/Implies.java \
- java/security/cert/GetInstance.java \
- java/util/Arrays/largeMemory/ParallelPrefix.java \
- java/util/logging/DrainFindDeadlockTest.java \
- java/util/logging/LoggingMXBeanTest.java \
- java/util/logging/TestLogConfigurationDeadLock.java \
- java/util/logging/TestLoggerBundleSync.java \
- sun/net/www/http/KeepAliveCache/B5045306.java \
- sun/security/provider/PolicyFile/Alias.java \
- sun/security/provider/PolicyFile/Comparator.java \
- sun/security/provider/PolicyFile/SelfWildcard.java \
- sun/security/ssl/SSLEngineImpl/SSLEngineDeadlock.java \
- sun/security/util/Oid/OidFormat.java \
- sun/security/util/Resources/Format.java \
- sun/security/util/Resources/NewNamesFormat.java
-
-# Compact 2 adds full VM tests
-compact2 = \
- :compact2_minimal \
- :compact1 \
- :needs_full_vm_compact2 \
- -:needs_compact3 \
- -:needs_jre \
- -:needs_jdk
-
-# Tests that require compact2 API's and a full VM
-#
-needs_full_vm_compact2 =
-
-# Minimal VM on Compact 2 adds in some compact2 tests
-#
-compact2_minimal = \
- :compact1_minimal \
- :needs_compact2 \
- -:needs_compact3 \
- -:needs_jre \
- -:needs_jdk
-
-# Tests that require compact2 API's
-#
-needs_compact2 = \
- :jdk_rmi \
- :jdk_time \
- com/sun/org/apache \
- com/sun/net/httpserver \
- java/sql \
- javax/sql \
- javax/xml \
- jdk/lambda \
- sun/net/www/http \
- sun/net/www/protocol/http \
- java/io/BufferedReader/Lines.java \
- java/lang/reflect/DefaultStaticTest/DefaultStaticInvokeTest.java \
- java/lang/IntegralPrimitiveToString.java \
- java/lang/PrimitiveSumMinMaxTest.java \
- java/lang/String/StringJoinTest.java \
- java/lang/Thread/StopThrowable.java \
- java/net/Authenticator/B4769350.java \
- java/net/Authenticator/Deadlock.java \
- java/net/CookieHandler/LocalHostCookie.java \
- java/net/CookieHandler/CookieManagerTest.java \
- java/net/CookieHandler/EmptyCookieHeader.java \
- java/net/HttpCookie/IllegalCookieNameTest.java \
- java/net/HttpURLConnection/UnmodifiableMaps.java \
- java/net/ResponseCache/Test.java \
- java/net/URLClassLoader/ClassLoad.java \
- java/net/URLClassLoader/closetest/CloseTest.java \
- java/net/URLPermission/URLTest.java \
- java/nio/Buffer/Chars.java \
- java/nio/file/Files/StreamTest.java \
- java/security/BasicPermission/Wildcard.java \
- java/util/Arrays/SetAllTest.java \
- java/util/BitSet/stream/BitSetStreamTest.java \
- java/util/Collection/CollectionDefaults.java \
- java/util/Collections/CheckedIdentityMap.java \
- java/util/Collections/CheckedMapBash.java \
- java/util/Collections/CheckedSetBash.java \
- java/util/Collections/EmptyCollectionSerialization.java \
- java/util/Collections/EmptyNavigableMap.java \
- java/util/Collections/EmptyNavigableSet.java \
- java/util/Collections/UnmodifiableMapEntrySet.java \
- java/util/Comparator/BasicTest.java \
- java/util/Comparator/TypeTest.java \
- java/util/Date/TimestampTest.java \
- java/util/Iterator/IteratorDefaults.java \
- java/util/Iterator/PrimitiveIteratorDefaults.java \
- java/util/List/ListDefaults.java \
- java/util/Map/BasicSerialization.java \
- java/util/Map/Defaults.java \
- java/util/Map/EntryComparators.java \
- java/util/Optional/Basic.java \
- java/util/Optional/BasicDouble.java \
- java/util/Optional/BasicInt.java \
- java/util/Optional/BasicLong.java \
- java/util/Random/RandomStreamTest.java \
- java/util/ResourceBundle/Bug6359330.java \
- java/util/Spliterator/SpliteratorCharacteristics.java \
- java/util/Spliterator/SpliteratorCollisions.java \
- java/util/Spliterator/SpliteratorLateBindingTest.java \
- java/util/Spliterator/SpliteratorFailFastTest.java \
- java/util/Spliterator/SpliteratorTraversingAndSplittingTest.java \
- java/util/StringJoiner/MergeTest.java \
- java/util/StringJoiner/StringJoinerTest.java \
- java/util/concurrent/atomic/AtomicReferenceTest.java \
- java/util/function/BinaryOperator/BasicTest.java \
- java/util/logging/LoggerSupplierAPIsTest.java \
- java/util/zip/ZipFile/StreamZipEntriesTest.java \
- java/util/zip/ZipFile/DeleteTempJar.java \
- javax/crypto/Cipher/CipherStreamClose.java \
- sun/net/www/protocol/https/HttpsURLConnection/HttpsCreateSockTest.java \
- sun/net/www/protocol/https/HttpsURLConnection/HttpsSocketFacTest.java
-
-# Compact 1 adds full VM tests
-#
-compact1 = \
- :compact1_minimal \
- :needs_full_vm_compact1 \
- -:needs_compact2 \
- -:needs_full_vm_compact2 \
- -:needs_compact3 \
- -:needs_jre \
- -:needs_jdk
-
-# Tests that require compact1 API's and a full VM
-#
-needs_full_vm_compact1 =
-
-# All tests that run on the most minimal configuration: Minimal VM on Compact 1
-compact1_minimal = \
- com \
- java \
- javax \
- jdk \
- lib \
- sun \
- vm \
- -:needs_full_vm_compact1 \
- -:needs_full_vm_compact2 \
- -:needs_compact2 \
- -:needs_compact3 \
- -:needs_jre \
- -:needs_jdk
-
-needs_headful = \
- java/util/TimeZone/DefaultTimeZoneTest.java
-
-needs_locales = \
- -:needs_locales_and_charsets \
- java/text/Collator/APITest.java \
- java/text/Collator/CollationKeyTest.java \
- java/text/Collator/DanishTest.java \
- java/text/Collator/FinnishTest.java \
- java/text/Collator/FrenchTest.java \
- java/text/Collator/G7Test.java \
- java/text/Collator/JapaneseTest.java \
- java/text/Collator/KoreanTest.java \
- java/text/Collator/Regression.java \
- java/text/Collator/TurkishTest.java \
- java/text/Collator/VietnameseTest.java \
- java/text/Format/DateFormat/bug4117335.java \
- java/text/Format/DateFormat/DateFormatTest.java \
- java/text/Format/DateFormat/IntlTestDateFormatSymbols.java \
- java/text/Format/DateFormat/NonGregorianFormatTest.java \
- java/text/Format/NumberFormat/IntlTestNumberFormatAPI.java \
- java/text/Format/NumberFormat/NumberRegression.java \
- java/text/Format/NumberFormat/NumberTest.java \
- java/util/Calendar/Bug4302966.java \
- java/util/TimeZone/HongKong.java \
- java/util/TimeZone/TimeZoneTest.java \
- java/util/Calendar/NarrowNamesTest.sh \
- java/util/Locale/Bug8001562.java \
- java/util/Locale/InternationalBAT.java \
- java/util/Locale/LocaleEnhanceTest.java \
- java/util/Locale/LocaleTest.java \
- java/util/Locale/ThaiGov.java \
- java/text/Format/DateFormat/Bug4823811.java \
- java/text/Format/DateFormat/Bug6683975.java \
- java/text/Format/DateFormat/ContextMonthNamesTest.java \
- java/text/Format/DecimalFormat/RoundingAndPropertyTest.java \
- java/time/test/java/time/format/TestDateTimeFormatterBuilder.java \
- java/time/test/java/time/format/TestDateTimeTextProvider.java \
- java/time/test/java/time/format/TestNonIsoFormatter.java \
- java/time/test/java/time/format/TestTextParser.java \
- java/time/test/java/time/format/TestTextPrinter.java \
- java/util/Currency/CurrencyTest.java \
- java/util/Formatter/Basic.java \
- sun/text/resources/Collator/Bug4248694.java \
- sun/text/resources/Collator/Bug4804273.java \
- sun/text/resources/Collator/Bug6755060.java \
- sun/text/resources/Format/Bug4395196.java \
- sun/text/resources/Format/Bug4442855.java \
- sun/text/resources/Format/Bug4621320.java \
- sun/text/resources/Format/Bug4651568.java \
- sun/text/resources/Format/Bug4762201.java \
- sun/text/resources/Format/Bug4807540.java \
- sun/text/resources/Format/Bug4810032.java \
- sun/text/resources/Format/Bug4994312.java \
- sun/text/resources/Format/Bug5096553.java \
- sun/text/resources/LocaleDataTest.java \
- sun/util/resources/Calendar/Bug4518811.java \
- sun/util/resources/Calendar/Bug4527203.java \
- sun/util/resources/Locale/Bug4429024.java \
- sun/util/resources/Locale/Bug4965260.java \
- sun/util/resources/Locale/Bug6275682.java \
- sun/util/resources/TimeZone/Bug6271396.java \
- sun/util/resources/TimeZone/Bug6317929.java \
- sun/util/resources/TimeZone/Bug6377794.java \
- sun/util/resources/TimeZone/Bug6442006.java
-
-needs_locales_and_charsets = \
- java/text/BreakIterator/NewVSOld_th_TH.java \
- java/util/Locale/InternationalBAT.java
-
-needs_sunec = \
- -:needs_sunec_and_sunpkcs11 \
- sun/security/ec/TestEC.java
-
-needs_sunpkcs11 = \
- -:needs_sunec_and_sunpkcs11 \
- sun/security/pkcs11/Secmod \
- sun/security/tools/keytool/autotest.sh
-
-needs_sunec_and_sunpkcs11 = \
- sun/security/pkcs11/Secmod/AddPrivateKey.java \
- sun/security/pkcs11/Secmod/TrustAnchors.java
-
-needs_nashorn = \
- javax/script