From 06deba25ee9f255ff77a946dc157555b54ba4fe1 Mon Sep 17 00:00:00 2001
From: Yegor <yjbanov@google.com>
Date: Wed, 31 May 2017 15:13:08 -0700
Subject: [PATCH] move more tests to Linux hosts (#10413)

* move more tests to Linux hosts

* fix test
---
 dev/devicelab/manifest.yaml           | 64 +++++++++++++--------------
 dev/devicelab/test/manifest_test.dart |  2 +-
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/dev/devicelab/manifest.yaml b/dev/devicelab/manifest.yaml
index d42e025e936..e57af6b7166 100644
--- a/dev/devicelab/manifest.yaml
+++ b/dev/devicelab/manifest.yaml
@@ -37,13 +37,6 @@ tasks:
   # TODO: make these not require "has-android-device"; it is only there to
   #       ensure we have the Android SDK.
 
-  flutter_gallery__build:
-    description: >
-      Collects various performance metrics from AOT builds of the Flutter
-      Gallery.
-    stage: devicelab
-    required_agent_capabilities: ["has-android-device"]
-
   complex_layout__build:
     description: >
       Collects various performance metrics from AOT builds of the Complex
@@ -90,25 +83,12 @@ tasks:
     stage: devicelab
     required_agent_capabilities: ["has-android-device"]
 
-  flutter_gallery__start_up:
-    description: >
-      Measures the startup time of the Flutter Gallery app on Android.
-    stage: devicelab
-    required_agent_capabilities: ["has-android-device"]
-
   complex_layout__start_up:
     description: >
       Measures the startup time of the Complex Layout sample app on Android.
     stage: devicelab
     required_agent_capabilities: ["has-android-device"]
 
-  flutter_gallery__transition_perf:
-    description: >
-      Measures the performance of screen transitions in Flutter Gallery on
-      Android.
-    stage: devicelab
-    required_agent_capabilities: ["has-android-device"]
-
   hot_mode_dev_cycle__benchmark:
     description: >
       Measures the performance of Dart VM hot patching feature.
@@ -127,18 +107,6 @@ tasks:
     stage: devicelab
     required_agent_capabilities: ["has-android-device"]
 
-  flutter_gallery__memory_nav:
-    description: >
-      Measures memory usage after repeated navigation in Gallery.
-    stage: devicelab
-    required_agent_capabilities: ["has-android-device"]
-
-  flutter_gallery__back_button_memory:
-    description: >
-      Measures memory usage after Android app suspend and resume.
-    stage: devicelab
-    required_agent_capabilities: ["has-android-device"]
-
   microbenchmarks:
     description: >
       Runs benchmarks from dev/benchmarks/microbenchmarks.
@@ -284,3 +252,35 @@ tasks:
     stage: devicelab
     required_agent_capabilities: ["linux/android"]
     flaky: true
+
+  flutter_gallery__build:
+    description: >
+      Collects various performance metrics from AOT builds of the Flutter
+      Gallery.
+    stage: devicelab
+    required_agent_capabilities: ["linux/android"]
+
+  flutter_gallery__start_up:
+    description: >
+      Measures the startup time of the Flutter Gallery app on Android.
+    stage: devicelab
+    required_agent_capabilities: ["linux/android"]
+
+  flutter_gallery__transition_perf:
+    description: >
+      Measures the performance of screen transitions in Flutter Gallery on
+      Android.
+    stage: devicelab
+    required_agent_capabilities: ["linux/android"]
+
+  flutter_gallery__memory_nav:
+    description: >
+      Measures memory usage after repeated navigation in Gallery.
+    stage: devicelab
+    required_agent_capabilities: ["linux/android"]
+
+  flutter_gallery__back_button_memory:
+    description: >
+      Measures memory usage after Android app suspend and resume.
+    stage: devicelab
+    required_agent_capabilities: ["linux/android"]
diff --git a/dev/devicelab/test/manifest_test.dart b/dev/devicelab/test/manifest_test.dart
index eb1e39874ed..12185569d00 100644
--- a/dev/devicelab/test/manifest_test.dart
+++ b/dev/devicelab/test/manifest_test.dart
@@ -15,7 +15,7 @@ void main() {
       final ManifestTask task = manifest.tasks.firstWhere((ManifestTask task) => task.name == 'flutter_gallery__start_up');
       expect(task.description, 'Measures the startup time of the Flutter Gallery app on Android.\n');
       expect(task.stage, 'devicelab');
-      expect(task.requiredAgentCapabilities, <String>['has-android-device']);
+      expect(task.requiredAgentCapabilities, <String>['linux/android']);
     });
   });