| commit | 929aaa5f55ced99bf27408b33e447d90e1df7f10 | [log] [tgz] |
|---|---|---|
| author | Christoffer Quist Adamsen <christofferqa@google.com> | Tue Oct 13 08:53:39 2020 +0200 |
| committer | Christoffer Quist Adamsen <christofferqa@google.com> | Tue Oct 13 07:53:29 2020 +0000 |
| tree | b61a0d5a53f842f6319c6c32cc24febcefcdf93d | |
| parent | 1d98f7b25f64f8478550042a303177de3da6ef14 [diff] |
Update Jdk11StreamTests expectation in presence of horizontal class merging Change-Id: Ibdf2bba8fd3cb5b9c3c5f7a096c77010ee00957a
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11StreamTests.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11StreamTests.java index 3268a35..c75123e 100644 --- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11StreamTests.java +++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdktests/Jdk11StreamTests.java
@@ -182,7 +182,9 @@ @Test public void testStream() throws Exception { expectThrowsWithHorizontalClassMergingIf( - shrinkDesugaredLibrary && parameters.getApiLevel().isLessThan(AndroidApiLevel.N)); + shrinkDesugaredLibrary + && parameters.getApiLevel().isLessThan(AndroidApiLevel.N) + && !parameters.getDexRuntimeVersion().isDefault()); Assume.assumeFalse( "getAllFilesWithSuffixInDirectory() seems to find different files on Windows", ToolHelper.isWindows());