It's a winner!
On Mon, Dec 14, 2015 at 1:53 PM, Stuart Marks <stuart.ma...@oracle.com> wrote:
>
>
> On 12/11/15 12:23 PM, Martin Buchholz wrote:
>>
>> I added Iterator and Comparator to "my" list of tests. Thanks!
>>
>> The key difference is that we don't try to separate concurrent and
>> non-concurrent collections, so my "collections test set" includes all
>> of /java/util/concurrent even though it's technically overkill. But
>> we've optimized those tests so they run much more quickly now!
>>
>> So I encourage you to also make jdk_concurrent a subset of
>> jdk_collections if that's compatible with the makefile conventions.
>
>
> OK, how about this then?
>
> * jdk_collections = jdk_collections_core + jdk_concurrent
>
> * jdk_collections_core = ("classic" collections framework classes, without
> j.u.c.)
>
> * jdk_concurrent = (same as it ever was)
>
> Diffs below.
>
> s'marks
>
>
>
> # HG changeset patch
> # User smarks
> # Date 1449887489 28800
> # Fri Dec 11 18:31:29 2015 -0800
> # Node ID e96855cde1677ffa0c681e1496d628afcd15037f
> # Parent 83e427bf6451d5145f58ba7654d586232d0c91be
> 8145139: clean up jdk_collections and jdk_concurrent test groups
> Reviewed-by: XXX
>
> diff -r 83e427bf6451 -r e96855cde167 test/TEST.groups
> --- a/test/TEST.groups Fri Dec 11 17:01:01 2015 -0800
> +++ b/test/TEST.groups Fri Dec 11 18:31:29 2015 -0800
> @@ -95,16 +95,18 @@
> -:jdk_concurrent \
> -:jdk_stream
>
> -# java.util.concurrent (JSR-166)
> -# Maintained by JSR-166 EG (Doug Lea et al)
> -# Deque and PriorityQueue are also generally maintained by JSR-166
> +jdk_collections = \
> + :jdk_collections_core \
> + :jdk_concurrent
> +
> +# java.util.concurrent
> +# Includes concurrent collections and other stuff.
> +# Maintained by JSR-166 EG (Doug Lea et al).
> jdk_concurrent = \
> - java/util/concurrent \
> - java/util/Deque \
> - java/util/PriorityQueue
> + java/util/concurrent
>
> -# Java Collections Framework
> -jdk_collections = \
> +# Java Collections Framework core classes.
> +jdk_collections_core = \
> java/util/AbstractCollection \
> java/util/AbstractList \
> java/util/AbstractMap \
> @@ -114,19 +116,22 @@
>
> java/util/BitSet \
> java/util/Collection \
> java/util/Collections \
> + java/util/Comparator \
> + java/util/Deque \
> java/util/EnumMap \
> java/util/EnumSet \
> - java/util/Comparator \
> - java/util/Iterator \
> java/util/HashMap \
> + java/util/HashSet \
> java/util/Hashtable \
> java/util/IdentityHashMap \
> - java/util/List \
> + java/util/Iterator \
> java/util/LinkedHashMap \
> java/util/LinkedHashSet \
> java/util/LinkedList \
> + java/util/List \
> java/util/Map \
> java/util/NavigableMap \
> + java/util/PriorityQueue \
> java/util/TimSort \
> java/util/TreeMap \
> java/util/Vector \
>
>
