[Fuchsia] Enable blink web tests on Fuchsia x64 bots

Also:
1. Removed --qemy-require-kvm flag from the runner script since
run_web_tests.py doesn't support that flag. Instead KVM requirement is
handled by the runner script directly.
2. Disabled sharding when running layout tests on Fuchsia, including on
FYI bots: it doesn't make much sense to shard these tests since we run
only smoke tests and sharding overhead is comparable to the time it
takes to run all tests on a single bot.

Bug: 778467
Change-Id: Ice7a11ebf5c51c84550745e8e88cd71cd300b0fd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1549585
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Kevin Marshall <kmarshall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#649323}

build/fuchsia/common_args.py

@@ -65,9 +65,6 @@ def AddCommonArgs(arg_parser):
   common_args.add_argument('--qemu-cpu-cores', type=int, default=4,
                            help='Sets the number of CPU cores to provide if '
                            'launching in a VM with QEMU.'),
-  common_args.add_argument('--qemu-require-kvm', action='store_true',
-                           help='Disables fall-back to emulated CPU if the '
-                           'host system does not support KVM acceleration.'),
   common_args.add_argument(
       '--os_check', choices=['check', 'update', 'ignore'],
       default='update',
@@ -106,11 +103,14 @@ def GetDeploymentTargetForArgs(args):
     system_log_file = None
 
   if not args.device:
+    # KVM is required on x64 test bots.
+    require_kvm = args.test_launcher_bot_mode and args.target_cpu == "x64"
+
     return QemuTarget(output_dir=args.output_directory,
                       target_cpu=args.target_cpu,
                       cpu_cores=args.qemu_cpu_cores,
                       system_log_file=system_log_file,
-                      require_kvm=args.qemu_require_kvm)
+                      require_kvm=require_kvm)
   else:
     return DeviceTarget(output_dir=args.output_directory,
                         target_cpu=args.target_cpu,

testing/buildbot/chromium.fyi.json

@@ -4633,8 +4633,7 @@
             {
               "kvm": "1"
             }
-          ],
-          "shards": 12
+          ]
         }
       }
     ]

testing/buildbot/chromium.linux.json

@@ -666,9 +666,6 @@
     ],
     "gtest_tests": [
       {
-        "args": [
-          "--qemu-require-kvm"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -680,9 +677,6 @@
         "test": "angle_unittests"
       },
       {
-        "args": [
-          "--qemu-require-kvm"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -694,9 +688,6 @@
         "test": "base_unittests"
       },
       {
-        "args": [
-          "--qemu-require-kvm"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -708,9 +699,6 @@
         "test": "blink_common_unittests"
       },
       {
-        "args": [
-          "--qemu-require-kvm"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -722,9 +710,6 @@
         "test": "blink_heap_unittests"
       },
       {
-        "args": [
-          "--qemu-require-kvm"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -736,9 +721,6 @@
         "test": "blink_platform_unittests"
       },
       {
-        "args": [
-          "--qemu-require-kvm"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -750,9 +732,6 @@
         "test": "cast_runner_browsertests"
       },
       {
-        "args": [
-          "--qemu-require-kvm"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -765,8 +744,7 @@
       },
       {
         "args": [
-          "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.content_unittests.filter",
-          "--qemu-require-kvm"
+          "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.content_unittests.filter"
         ],
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -779,9 +757,6 @@
         "test": "content_unittests"
       },
       {
-        "args": [
-          "--qemu-require-kvm"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -793,9 +768,6 @@
         "test": "cr_fuchsia_base_unittests"
       },
       {
-        "args": [
-          "--qemu-require-kvm"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -807,9 +779,6 @@
         "test": "cronet_tests"
       },
       {
-        "args": [
-          "--qemu-require-kvm"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -821,9 +790,6 @@
         "test": "cronet_unittests"
       },
       {
-        "args": [
-          "--qemu-require-kvm"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -835,9 +801,6 @@
         "test": "crypto_unittests"
       },
       {
-        "args": [
-          "--qemu-require-kvm"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -849,9 +812,6 @@
         "test": "fidlgen_js_unittests"
       },
       {
-        "args": [
-          "--qemu-require-kvm"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -863,9 +823,6 @@
         "test": "gpu_unittests"
       },
       {
-        "args": [
-          "--qemu-require-kvm"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -877,9 +834,6 @@
         "test": "http_service_tests"
       },
       {
-        "args": [
-          "--qemu-require-kvm"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -891,9 +845,6 @@
         "test": "ipc_tests"
       },
       {
-        "args": [
-          "--qemu-require-kvm"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -906,8 +857,7 @@
       },
       {
         "args": [
-          "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.mojo_unittests.filter",
-          "--qemu-require-kvm"
+          "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.mojo_unittests.filter"
         ],
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -921,8 +871,7 @@
       },
       {
         "args": [
-          "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.net_unittests.filter",
-          "--qemu-require-kvm"
+          "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.net_unittests.filter"
         ],
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -935,9 +884,6 @@
         "test": "net_unittests"
       },
       {
-        "args": [
-          "--qemu-require-kvm"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -949,9 +895,6 @@
         "test": "perfetto_unittests"
       },
       {
-        "args": [
-          "--qemu-require-kvm"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -963,9 +906,6 @@
         "test": "service_manager_unittests"
       },
       {
-        "args": [
-          "--qemu-require-kvm"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -977,9 +917,6 @@
         "test": "skia_unittests"
       },
       {
-        "args": [
-          "--qemu-require-kvm"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -992,8 +929,7 @@
       },
       {
         "args": [
-          "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.ui_base_unittests.filter",
-          "--qemu-require-kvm"
+          "--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.ui_base_unittests.filter"
         ],
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -1006,9 +942,6 @@
         "test": "ui_base_unittests"
       },
       {
-        "args": [
-          "--qemu-require-kvm"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -1020,9 +953,6 @@
         "test": "web_engine_browsertests"
       },
       {
-        "args": [
-          "--qemu-require-kvm"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -1034,9 +964,6 @@
         "test": "web_engine_unittests"
       },
       {
-        "args": [
-          "--qemu-require-kvm"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -1047,6 +974,31 @@
         },
         "test": "web_runner_integration_tests"
       }
+    ],
+    "isolated_scripts": [
+      {
+        "args": [
+          "--num-retries=3",
+          "--platform=fuchsia"
+        ],
+        "isolate_name": "blink_web_tests_exparchive",
+        "merge": {
+          "args": [
+            "--verbose"
+          ],
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
+        },
+        "name": "webkit_layout_tests",
+        "results_handler": "layout tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "kvm": "1"
+            }
+          ]
+        }
+      }
     ]
   },
   "Leak Detection Linux": {

testing/buildbot/test_suite_exceptions.pyl

@@ -1573,6 +1573,9 @@
         'args': [
           '--platform=fuchsia',
         ],
+        'swarming': {
+          'shards': 1,
+        },
       },
       'linux-blink-animation-use-time-delta': {
         'args': [
@@ -1650,6 +1653,14 @@
         ],
       },
       # chromium.linux
+      'Fuchsia x64': {
+        'args': [
+          '--platform=fuchsia',
+        ],
+        'swarming': {
+          'shards': 1,
+        },
+      },
       'Linux Tests': {
         'swarming': {
           'dimension_sets': [

testing/buildbot/waterfalls.pyl

@@ -3124,9 +3124,6 @@
         'additional_compile_targets': [
           'all',
         ],
-        'args': [
-          '--qemu-require-kvm',
-        ],
         'swarming': {
           'dimension_sets': [
             {
@@ -3136,6 +3133,7 @@
         },
         'test_suites': {
           'gtest_tests': 'fuchsia_gtests',
+          'isolated_scripts': 'chromium_webkit_isolated_scripts',
         },
       },
       'Leak Detection Linux': {