Re-enable all shrinking tests - They were all failing due to internal use of ConcurrentHashMap static initialization. Bug: 142377475 Change-Id: I53229b3d02ec9d0b2eef6b08b2b5ac0c8968b72c
diff --git a/src/test/java/com/android/tools/r8/desugar/corelib/CustomCollectionTest.java b/src/test/java/com/android/tools/r8/desugar/corelib/CustomCollectionTest.java index 71cbfcd..54ab923 100644 --- a/src/test/java/com/android/tools/r8/desugar/corelib/CustomCollectionTest.java +++ b/src/test/java/com/android/tools/r8/desugar/corelib/CustomCollectionTest.java
@@ -57,8 +57,6 @@ @Test public void testCustomCollectionD8() throws Exception { - // TODO(b/142377475). - Assume.assumeTrue(!shrinkDesugaredLibrary); KeepRuleConsumer keepRuleConsumer = createKeepRuleConsumer(parameters); D8TestRunResult d8TestRunResult = testForD8()
diff --git a/src/test/java/com/android/tools/r8/desugar/corelib/corelibjdktests/Jdk11AtomicTests.java b/src/test/java/com/android/tools/r8/desugar/corelib/corelibjdktests/Jdk11AtomicTests.java index 0010c65..b90e644 100644 --- a/src/test/java/com/android/tools/r8/desugar/corelib/corelibjdktests/Jdk11AtomicTests.java +++ b/src/test/java/com/android/tools/r8/desugar/corelib/corelibjdktests/Jdk11AtomicTests.java
@@ -72,8 +72,6 @@ @Test public void testD8AtomicReference() throws Exception { - // TODO(b/142377475). - Assume.assumeTrue(!shrinkDesugaredLibrary); KeepRuleConsumer keepRuleConsumer = createKeepRuleConsumer(parameters); String verbosity = "2"; testForD8() @@ -97,8 +95,6 @@ @Test public void testD8AtomicUpdaters() throws Exception { - // TODO(b/142377475). - Assume.assumeTrue(!shrinkDesugaredLibrary); KeepRuleConsumer keepRuleConsumer = createKeepRuleConsumer(parameters); String verbosity = "2"; testForD8()