| commit | 7a11752a8ae7689d2bd482e23d466cb44a3261a1 | [log] [tgz] |
|---|---|---|
| author | sgjesse <sgjesse@google.com> | Tue Aug 18 00:43:10 2020 -0700 |
| committer | Copybara-Service <copybara-worker@google.com> | Tue Aug 18 00:44:40 2020 -0700 |
| tree | f8788731810bdef1ef2abe1cfa658ed5fe896629 | |
| parent | 9993785fa0c4fa4172aa31d306f3abea76833abf [diff] |
Don't run DexFileMergerTest as it is not supported for all r8.jar's RELNOTES: None PiperOrigin-RevId: 327180192
diff --git a/src/test/java/com/google/devtools/build/android/r8/BUILD b/src/test/java/com/google/devtools/build/android/r8/BUILD index df1a879..a47c18c 100644 --- a/src/test/java/com/google/devtools/build/android/r8/BUILD +++ b/src/test/java/com/google/devtools/build/android/r8/BUILD
@@ -22,6 +22,7 @@ "//external:has_androidsdk": glob( ["*Test.java"], exclude = [ + "DexFileMergerTest.java", "NoAndroidSdkStubTest.java", "AllTests.java", ],
diff --git a/src/test/java/com/google/devtools/build/android/r8/DexFileMergerTest.java b/src/test/java/com/google/devtools/build/android/r8/DexFileMergerTest.java index bd220bd..56c5fb6 100644 --- a/src/test/java/com/google/devtools/build/android/r8/DexFileMergerTest.java +++ b/src/test/java/com/google/devtools/build/android/r8/DexFileMergerTest.java
@@ -43,8 +43,6 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -// import com.android.tools.r8.maindexlist.MainDexListTests; - /** Test for DexFileMerger. */ @RunWith(JUnit4.class) public class DexFileMergerTest {