[fuchsia] Fix exe_runner.py

non-test fuchsia runner was broken because it had dependency on
args.test_launcher_bot_mode, but that argument exists only for test
runners.

Change-Id: Ib19e03d5e30534f14968041ae785ef65bdcb9033
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1720794
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Auto-Submit: Sergey Ulanov <sergeyu@chromium.org>
Reviewed-by: Fabrice de Gans-Riberi <fdegans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#683820}

build/fuchsia/common_args.py

@@ -91,7 +91,7 @@ def ConfigureLogging(args):
       logging.DEBUG if args.verbose else logging.WARN)
 
 
-def GetDeploymentTargetForArgs(args):
+def GetDeploymentTargetForArgs(args, require_kvm=False):
   """Constructs a deployment target object using parameters taken from
   command line arguments."""
 
@@ -103,9 +103,6 @@ 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,

build/fuchsia/test_runner.py

@@ -104,7 +104,10 @@ def main():
   if args.child_args:
     child_args.extend(args.child_args)
 
-  with GetDeploymentTargetForArgs(args) as target:
+  # KVM is required on x64 test bots.
+  require_kvm = args.test_launcher_bot_mode and args.target_cpu == 'x64'
+
+  with GetDeploymentTargetForArgs(args, require_kvm=require_kvm) as target:
     target.Start()
 
     if args.test_launcher_filter_file: