[Fuchsia] Allow x64 FYI Fuchsia Bots to Use AEMU.

Add AEMU to fuchsia_package_runner template. Add Mixin for AEMU flag, apply mixin to FYI Fuchsia Bots. Add missing filter for components_unittests. Bug: 1000906 Change-Id: I495074e7d811db850c43b60dfd6e1ae052702781 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1793522 Commit-Queue: Chong Gu <chonggu@google.com> Reviewed-by: Wez <wez@chromium.org> Reviewed-by: John Budorick <jbudorick@chromium.org> Cr-Commit-Position: refs/heads/master@{#704938}

[Fuchsia] Allow x64 FYI Fuchsia Bots to Use AEMU.
Add AEMU to fuchsia_package_runner template. Add Mixin for AEMU flag, apply mixin to FYI Fuchsia Bots. Add missing filter for components_unittests. Bug: 1000906 Change-Id: I495074e7d811db850c43b60dfd6e1ae052702781 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1793522 Commit-Queue: Chong Gu <chonggu@google.com> Reviewed-by: Wez <wez@chromium.org> Reviewed-by: John Budorick <jbudorick@chromium.org> Cr-Commit-Position: refs/heads/master@{#704938}
2de75bbf · Chong Gu · Commit Bot · 72e1b53f · 2de75bbf · 2de75bbf
Commit 2de75bbf authored Oct 11, 2019 by Chong Gu Committed by Commit Bot Oct 11, 2019
5 changed files
--- a/build/config/fuchsia/config.gni
+++ b/build/config/fuchsia/config.gni
@@ -19,6 +19,7 @@ if (current_cpu == "arm64") {
 }

 # Compute the qemu path.
+aemu_root = "//third_party/aemu-${host_os}-${host_cpu}"
 qemu_root = "//third_party/qemu-${host_os}-${host_cpu}"

 # Compute the path to the arch-specific boot image directory.

--- a/build/config/fuchsia/generate_runner_scripts.gni
+++ b/build/config/fuchsia/generate_runner_scripts.gni
@@ -97,6 +97,10 @@ template("fuchsia_package_runner") {
      "${boot_image_root}/qemu/zircon-a.zbi",
    ]

+    if (host_cpu == "x64" && target_cpu == "x64") {
+      data += [ "${aemu_root}/" ]
+    }
+
    executable_args = []

    package_paths = [ rebase_path(_package_path, root_build_dir) ]

--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -9251,6 +9251,9 @@
    ],
    "gtest_tests": [
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9267,6 +9270,9 @@
        "test": "angle_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9283,6 +9289,9 @@
        "test": "base_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9299,6 +9308,9 @@
        "test": "blink_common_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9315,6 +9327,9 @@
        "test": "blink_heap_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9331,6 +9346,9 @@
        "test": "blink_platform_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9347,6 +9365,9 @@
        "test": "cast_runner_browsertests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9363,6 +9384,9 @@
        "test": "cast_runner_integration_tests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9380,7 +9404,8 @@
      },
      {
        "args": [
-          "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.components_unittests.filter"
+          "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.components_unittests.filter",
+          "--device=aemu"
        ],
        "merge": {
          "args": [],
@@ -9399,7 +9424,8 @@
      },
      {
        "args": [
-          "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.content_unittests.filter"
+          "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.content_unittests.filter",
+          "--device=aemu"
        ],
        "merge": {
          "args": [],
@@ -9417,6 +9443,9 @@
        "test": "content_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9433,6 +9462,9 @@
        "test": "cr_fuchsia_base_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9449,6 +9481,9 @@
        "test": "cronet_tests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9465,6 +9500,9 @@
        "test": "cronet_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9481,6 +9519,9 @@
        "test": "crypto_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9497,6 +9538,9 @@
        "test": "fidlgen_js_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9513,6 +9557,9 @@
        "test": "gfx_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9529,6 +9576,9 @@
        "test": "gpu_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9545,6 +9595,9 @@
        "test": "http_service_tests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9561,6 +9614,9 @@
        "test": "ipc_tests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9578,7 +9634,8 @@
      },
      {
        "args": [
-          "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.mojo_unittests.filter"
+          "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.mojo_unittests.filter",
+          "--device=aemu"
        ],
        "merge": {
          "args": [],
@@ -9596,6 +9653,9 @@
        "test": "mojo_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9612,6 +9672,9 @@
        "test": "perfetto_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9629,7 +9692,8 @@
      },
      {
        "args": [
-          "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.services_unittests.filter"
+          "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.services_unittests.filter",
+          "--device=aemu"
        ],
        "merge": {
          "args": [],
@@ -9647,6 +9711,9 @@
        "test": "services_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9663,6 +9730,9 @@
        "test": "skia_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9680,7 +9750,8 @@
      },
      {
        "args": [
-          "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.ui_base_unittests.filter"
+          "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.ui_base_unittests.filter",
+          "--device=aemu"
        ],
        "merge": {
          "args": [],
@@ -9699,7 +9770,8 @@
      },
      {
        "args": [
-          "--child-arg=--ozone-platform=headless"
+          "--child-arg=--ozone-platform=headless",
+          "--device=aemu"
        ],
        "merge": {
          "args": [],
@@ -9717,6 +9789,9 @@
        "test": "viz_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9733,6 +9808,9 @@
        "test": "web_engine_browsertests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9749,6 +9827,9 @@
        "test": "web_engine_integration_tests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9765,6 +9846,9 @@
        "test": "web_engine_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9788,6 +9872,9 @@
    ],
    "gtest_tests": [
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9804,6 +9891,9 @@
        "test": "angle_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9820,6 +9910,9 @@
        "test": "base_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9836,6 +9929,9 @@
        "test": "blink_common_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9852,6 +9948,9 @@
        "test": "blink_heap_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9868,6 +9967,9 @@
        "test": "blink_platform_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9884,6 +9986,9 @@
        "test": "cast_runner_browsertests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9900,6 +10005,9 @@
        "test": "cast_runner_integration_tests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9917,7 +10025,8 @@
      },
      {
        "args": [
-          "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.components_unittests.filter"
+          "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.components_unittests.filter",
+          "--device=aemu"
        ],
        "merge": {
          "args": [],
@@ -9936,7 +10045,8 @@
      },
      {
        "args": [
-          "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.content_unittests.filter"
+          "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.content_unittests.filter",
+          "--device=aemu"
        ],
        "merge": {
          "args": [],
@@ -9954,6 +10064,9 @@
        "test": "content_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9970,6 +10083,9 @@
        "test": "cr_fuchsia_base_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -9986,6 +10102,9 @@
        "test": "cronet_tests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -10002,6 +10121,9 @@
        "test": "cronet_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -10018,6 +10140,9 @@
        "test": "crypto_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -10034,6 +10159,9 @@
        "test": "fidlgen_js_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -10050,6 +10178,9 @@
        "test": "gfx_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -10066,6 +10197,9 @@
        "test": "gpu_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -10082,6 +10216,9 @@
        "test": "http_service_tests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -10098,6 +10235,9 @@
        "test": "ipc_tests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -10115,7 +10255,8 @@
      },
      {
        "args": [
-          "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.mojo_unittests.filter"
+          "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.mojo_unittests.filter",
+          "--device=aemu"
        ],
        "merge": {
          "args": [],
@@ -10134,7 +10275,8 @@
      },
      {
        "args": [
-          "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.net_unittests.filter"
+          "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.net_unittests.filter",
+          "--device=aemu"
        ],
        "merge": {
          "args": [],
@@ -10152,6 +10294,9 @@
        "test": "net_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -10168,6 +10313,9 @@
        "test": "perfetto_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -10185,7 +10333,8 @@
      },
      {
        "args": [
-          "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.services_unittests.filter"
+          "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.services_unittests.filter",
+          "--device=aemu"
        ],
        "merge": {
          "args": [],
@@ -10203,6 +10352,9 @@
        "test": "services_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -10219,6 +10371,9 @@
        "test": "skia_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -10236,7 +10391,8 @@
      },
      {
        "args": [
-          "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.ui_base_unittests.filter"
+          "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.ui_base_unittests.filter",
+          "--device=aemu"
        ],
        "merge": {
          "args": [],
@@ -10255,7 +10411,8 @@
      },
      {
        "args": [
-          "--child-arg=--ozone-platform=headless"
+          "--child-arg=--ozone-platform=headless",
+          "--device=aemu"
        ],
        "merge": {
          "args": [],
@@ -10273,6 +10430,9 @@
        "test": "viz_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -10289,6 +10449,9 @@
        "test": "web_engine_browsertests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -10305,6 +10468,9 @@
        "test": "web_engine_integration_tests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -10321,6 +10487,9 @@
        "test": "web_engine_unittests"
      },
      {
+        "args": [
+          "--device=aemu"
+        ],
        "merge": {
          "args": [],
          "script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -10341,6 +10510,7 @@
      {
        "args": [
          "--num-retries=3",
+          "--device=aemu",
          "--platform=fuchsia"
        ],
        "isolate_name": "blink_web_tests_exparchive",

--- a/testing/buildbot/mixins.pyl
+++ b/testing/buildbot/mixins.pyl
@@ -193,6 +193,13 @@
      },
    },
  },
+  'fuchsia_aemu': {
+    '$mixin_append': {
+      'args': [
+        '--device=aemu',
+      ],
+    },
+  },
  'gpu_pool': {
    'swarming': {
      'dimensions': {

--- a/testing/buildbot/waterfalls.pyl
+++ b/testing/buildbot/waterfalls.pyl
@@ -1737,7 +1737,8 @@
          'all',
        ],
        'mixins': [
-          'linux-xenial',
+          'fuchsia_aemu',
+	  'linux-xenial',
        ],
        'swarming': {
          'dimension_sets': [
@@ -1755,6 +1756,7 @@
          'all',
        ],
        'mixins': [
+	        'fuchsia_aemu',
          'linux-xenial',
        ],
        'swarming': {