commit | 86acff83cc53acb8faddb83c44d293acc8131828 | [log] [tgz] |
---|---|---|
author | Mads Ager <ager@google.com> | Wed Jan 24 16:13:56 2018 +0100 |
committer | Mads Ager <ager@google.com> | Wed Jan 24 16:13:56 2018 +0100 |
tree | 53332ce4ca922d967a2c21731aa1bca5839227e2 | |
parent | d4aa891841cde83ccc65666bb0a8c666ff6b4403 [diff] |
Version 1.0.7 Merge: Fix test status for old art versions. CL: https://r8-review.googlesource.com/c/r8/+/15260 Test status only change. R=sgjesse@google.com Change-Id: I9ac949386646131cf2abaf5ec03c0bec2d7cf992
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java index bca780b..29fce2f 100644 --- a/src/main/java/com/android/tools/r8/Version.java +++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@ // This field is accessed from release scripts using simple pattern matching. // Therefore, changing this field could break our release scripts. - public static final String LABEL = "v1.0.6"; + public static final String LABEL = "v1.0.7"; private Version() { }
diff --git a/src/test/java/com/android/tools/r8/R8RunExamplesTest.java b/src/test/java/com/android/tools/r8/R8RunExamplesTest.java index 44015c9..d1bed68 100644 --- a/src/test/java/com/android/tools/r8/R8RunExamplesTest.java +++ b/src/test/java/com/android/tools/r8/R8RunExamplesTest.java
@@ -160,8 +160,10 @@ .put("filledarray.FilledArray", TestCondition.match(TestCondition.runtimesUpTo(Version.V6_0_1))) // Early art versions incorrectly print doubles. - .put( - "regress_70736958.Test", + .put("regress_70736958.Test", + TestCondition.match(TestCondition.runtimesUpTo(Version.V6_0_1))) + // Early art versions incorrectly print doubles. + .put("regress_72361252.Test", TestCondition.match(TestCondition.runtimesUpTo(Version.V6_0_1))) .build(); }