commit bf5097c6e23e8c0bd5bd90d70d4f4515e16f1d3b
author Rico Wind <ricow@google.com> Wed Mar 20 14:23:16 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 20 14:23:16 2019 +0000
tree 2b947f8600cdba79bea8f8802311bb4a91f3a767
parent 38cdcc68c2d81e2ec9805a75a8fd17935256fdae
parent ba990ca2e81df18ea065fa0c34f3af48410f7984

Merge "Only run cf backend tests on default configuration"

infra/config/global/luci-scheduler.cfg

diff --git a/infra/config/global/luci-scheduler.cfg b/infra/config/global/luci-scheduler.cfg
index 80de746..dd2e88a 100644
--- a/infra/config/global/luci-scheduler.cfg
+++ b/infra/config/global/luci-scheduler.cfg
@@ -152,7 +152,7 @@
   id: "linux"
   acl_sets: "default"
   triggering_policy: {
-    max_concurrent_invocations: 2
+    max_concurrent_invocations: 3
   }
   buildbucket {
     server: "cr-buildbucket.appspot.com"
@@ -165,7 +165,7 @@
   id: "linux-android-4.0.4"
   acl_sets: "default"
   triggering_policy: {
-    max_concurrent_invocations: 2
+    max_concurrent_invocations: 3
   }
   buildbucket {
     server: "cr-buildbucket.appspot.com"
@@ -187,6 +187,9 @@
 job {
   id: "linux-android-4.4.4"
   acl_sets: "default"
+  triggering_policy: {
+    max_concurrent_invocations: 2
+  }
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.r8.ci"
@@ -207,6 +210,9 @@
 job {
   id: "linux-android-5.1.1"
   acl_sets: "default"
+  triggering_policy: {
+    max_concurrent_invocations: 2
+  }
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.r8.ci"
@@ -227,6 +233,9 @@
 job {
   id: "linux-android-6.0.1"
   acl_sets: "default"
+  triggering_policy: {
+    max_concurrent_invocations: 3
+  }
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.r8.ci"
@@ -247,6 +256,9 @@
 job {
   id: "linux-android-7.0.0"
   acl_sets: "default"
+  triggering_policy: {
+    max_concurrent_invocations: 2
+  }
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.r8.ci"

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

diff --git a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
index 8b2eaf5..13cc8cb 100644
--- a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
+++ b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
@@ -2062,7 +2062,7 @@
       if (specification.skipTest) {
         continue;
       }
-      CompilationOptions thisOptions = new CompilationOptions(vmSpec.spec);
+      CompilationOptions thisOptions = new CompilationOptions(specification);
       if (r8CompilationOptions == null) {
         r8CompilationOptions = thisOptions;
         executeCompilerUnderTest(