commit c4502b1ea1ae232359f2e01f41d045ef0bdfb867
author Stephan Herhut <herhut@google.com> Tue Aug 08 11:10:24 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 08 11:10:24 2017 +0000
tree 8159f540e8e9dc7f416ce7a149fe85ca11c09656
parent 3cef43981f8c97dc56237ef8816225ea0c1982c9
parent 871b75b71138bee2c86a1cdb05ef056561ec1db7

Merge "Disable javac warnings for examples."

src/test/java/com/android/tools/r8/JctfTestSpecifications.java

diff --git a/src/test/java/com/android/tools/r8/JctfTestSpecifications.java b/src/test/java/com/android/tools/r8/JctfTestSpecifications.java
index 055a880..063d5fc 100644
--- a/src/test/java/com/android/tools/r8/JctfTestSpecifications.java
+++ b/src/test/java/com/android/tools/r8/JctfTestSpecifications.java
@@ -4850,7 +4850,7 @@
     if (testMatch(failuresToTriage, name, compilerUnderTest, dexVm, compilationMode)) {
       outcome = Outcome.FAILS_WITH_ART;
     }
-    if (testMatch(requiresInliningDisabled, name, compilerUnderTest, dexVm, compilationMode)) {
+    if (testMatch(timeoutsWithArt, name, compilerUnderTest, dexVm, compilationMode)) {
       assert outcome == null;
       outcome = Outcome.TIMEOUTS_WITH_ART;
     }

src/test/java/com/android/tools/r8/internal/R8GMSCoreV10DeployJarVerificationTest.java

diff --git a/src/test/java/com/android/tools/r8/internal/R8GMSCoreV10DeployJarVerificationTest.java b/src/test/java/com/android/tools/r8/internal/R8GMSCoreV10DeployJarVerificationTest.java
index ca713fd..dc2acae 100644
--- a/src/test/java/com/android/tools/r8/internal/R8GMSCoreV10DeployJarVerificationTest.java
+++ b/src/test/java/com/android/tools/r8/internal/R8GMSCoreV10DeployJarVerificationTest.java
@@ -22,11 +22,14 @@
     AndroidApp app1 = buildFromDeployJar(
         CompilerUnderTest.R8, CompilationMode.RELEASE,
         GMSCoreCompilationTestBase.GMSCORE_V10_DIR, false);
-    AndroidApp app2 = buildFromDeployJar(
-        CompilerUnderTest.R8, CompilationMode.RELEASE,
-        GMSCoreCompilationTestBase.GMSCORE_V10_DIR, false);
+    // TODO(sgjesse): Re-enable the deterministic test part when output is stable.
+    if (false) {
+      AndroidApp app2 = buildFromDeployJar(
+          CompilerUnderTest.R8, CompilationMode.RELEASE,
+          GMSCoreCompilationTestBase.GMSCORE_V10_DIR, false);
 
-    // Verify that the result of the two compilations was the same.
-    assertIdenticalApplications(app1, app2);
+      // Verify that the result of the two compilations was the same.
+      assertIdenticalApplications(app1, app2);
+    }
   }
 }