[fuchsia] reduce the standalone commands in fuchsia integration

multiple processes are now aggregated by one test_env_setup call.

Cq-Include-Trybots: luci.dart.try:vm-fuchsia-release-arm64-try,vm-fuchsia-release-x64-try
Bug: http://crbug.com/356463343
Change-Id: Ib41bd2b36eb5d06ceeb6b834f1024365650e0ca0
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/379560
Reviewed-by: Siva Annamalai <[email protected]>
Reviewed-by: Ryan Macnak <[email protected]>
Commit-Queue: Zijie He <[email protected]>

Author: zijiehe-google-com

DEPS

@@ -701,7 +701,7 @@ Var("dart_root") + "/third_party/pkg/tar":
     "packages": [
       {
       "package": "chromium/fuchsia/test-scripts",
-      "version": "EAdD2YcYwVrhF2q_zR6xUvPkcKlPb1tJyM_6_oOc84kC",
+      "version": "8WCo7tLjg_GoImlj5eax_w-wxsvRPnmaChqN4ok-5rYC",
       }
     ],
     "condition": 'download_fuchsia_deps',

build/fuchsia/test_env.py

@@ -0,0 +1,23 @@
+#!/usr/bin/env vpython3
+# Copyright (c) 2024, the Dart project authors.  Please see the AUTHORS file
+# for details. All rights reserved. Use of this source code is governed by a
+# BSD-style license that can be found in the LICENSE file.
+
+import os
+import sys
+
+sys.path.insert(
+    0,
+    os.path.abspath(
+        os.path.join(os.path.dirname(__file__),
+                     '../../third_party/fuchsia/test_scripts/test/')))
+
+# pylint: disable=wrong-import-position
+from test_env_setup import setup_env
+from compatible_utils import force_running_unattended
+
+if __name__ == '__main__':
+    force_running_unattended()
+    # Note, the dart process can only get the pid of with_envs.py, i.e. ppid of
+    # this script.
+    sys.exit(setup_env(os.getppid()))

build/fuchsia/with_envs.py

@@ -14,7 +14,7 @@
         os.path.join(os.path.dirname(__file__),
                      '../../third_party/fuchsia/test_scripts/test/')))
 
-from common import catch_sigterm, wait_for_sigterm
+from common import catch_sigterm
 
 
 def Main():

pkg/test_runner/lib/src/fuchsia.dart

@@ -3,156 +3,90 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:async';
-import 'dart:convert';
 import 'dart:io';
 
 import 'command.dart';
 
 // Runs tests on a fuchsia emulator with chromium maintained test-scripts and
 // CFv2 targets.
 class FuchsiaEmulator {
-  static const String testScriptRoot =
-      "./third_party/fuchsia/test_scripts/test/";
   static const String withEnv = "./build/fuchsia/with_envs.py";
-  static const String tmpRoot = "/tmp/dart_ffi_test/";
-  // TODO(#38752): Once we have vm/cc and AOT tests running, this will sometimes
-  // need to be the component for run_vm_tests or dart_precompiled_runtime.
-  static const String cmName = "dart_test_component.cm";
 
   final Map<String, String> envs = <String, String>{};
-  Process? daemonProc;
-  Process? emuProc;
-  String? emuName;
-  Process? repoProc;
+  Directory? daemonIsolateDir;
+  Process? publisher;
 
   // Publishes the packages to the Fuchsia environment.
   Future<void> publishPackage(String buildDir, String mode, String arch) async {
-    try {
-      await Directory(tmpRoot).delete(recursive: true);
-    } catch (_) {}
-    // The /tmp/ should always be present, recursive creation is not expected.
-    await Directory(tmpRoot).create();
-    assert(daemonProc == null);
-    daemonProc = await _run("isolate_daemon.py", []);
-    var isolateDir = await _captureStdout(daemonProc!);
-    print("+ ffx daemon running on $isolateDir should be ready now.");
-    envs["FFX_ISOLATE_DIR"] = isolateDir;
-    assert(emuProc == null);
-    emuProc = await _run("start_emulator.py", [
-      "--disable-graphics",
-      "--target-id-only",
-      "--product",
-      arch == "arm64" ? "terminal.qemu-arm64" : "terminal.x64",
-      "--device-spec",
-      "virtual_device_large"
-    ]);
-    emuName = await _captureStdout(emuProc!);
-    print("+ Targeting emu name $emuName");
-    await _assertRun("test_connection.py", [emuName!]);
-    await _assertRun("publish_package.py", [
-      "--packages",
-      _testPackagePath(buildDir, mode),
-      "--purge-repo",
-      "--repo",
-      _tempDirectoryOf("repo")
-    ]);
-    repoProc = await _run("serve_repo.py", [
-      "run",
-      "--serve-repo",
-      _tempDirectoryOf("repo"),
-      "--repo-name",
-      "dart-ffi-test-repo",
-      "--target-id",
-      emuName!
-    ]);
-    print("+ Fuchsia repo ${await _captureStdout(repoProc!)} is running "
-        "at ${_tempDirectoryOf('repo')}");
-    await _assertRun("pkg_resolve.py", [emuName!, _testPackageName(mode)]);
-  }
-
-  // Tears down the Fuchsia environment.
-  Future<void> stop() async {
-    assert(repoProc != null);
-    repoProc!.kill();
-    await repoProc!.exitCode;
-    assert(emuProc != null);
-    emuProc!.kill();
-    await emuProc!.exitCode;
-    assert(daemonProc != null);
-    daemonProc!.kill();
-    await daemonProc!.exitCode;
+    assert(daemonIsolateDir == null);
+    daemonIsolateDir = Directory.systemTemp.createTempSync();
+    envs["FFX_ISOLATE_DIR"] = daemonIsolateDir!.path;
+    assert(publisher == null);
+    var args = <String>[
+      "./build/fuchsia/test_env.py",
+      "--out-dir=${_outDir(buildDir, mode)}",
+      "--device-spec=virtual_device_large",
+      "--packages=dart_test_$mode.far",
+      "--logs-dir=${daemonIsolateDir!.path}"
+    ];
+    if (arch == "arm64") {
+      args.add("--product=terminal.qemu-arm64");
+    }
+    publisher = await Process.start(withEnv, args,
+        environment: envs, mode: ProcessStartMode.inheritStdio);
+    while (!await File(
+                "${daemonIsolateDir!.path}/test_env_setup.${publisher!.pid}.pid")
+            .exists() &&
+        await _isProcessRunning(publisher!, 1000)) {}
+    // TODO(38752): Should return a value to indicate the failure of the
+    // enviornment setup.
+    if (await _isProcessRunning(publisher!, 1)) {
+      print("+ ffx daemon running on $daemonIsolateDir should be ready now.");
+    } else {
+      print("+ environment setup failure.");
+    }
   }
 
   // Returns a command to execute a set of tests against the running Fuchsia
   // environment.
-  VMCommand getTestCommand(
-      String buildDir, String mode, String arch, List<String> arguments) {
+  VMCommand getTestCommand(String buildDir, String mode, String arch,
+      List<String> arguments, Map<String, String> environmentOverrides) {
+    environmentOverrides.addAll(envs);
     return VMCommand(
         withEnv,
-        _runArgs("run_executable_test.py", [
-          "--target-id",
-          emuName!,
-          "--out-dir",
-          _tempDirectoryOf("out"),
-          "--test-name",
-          "fuchsia-pkg://fuchsia.com/${_testPackageName(mode)}#meta/$cmName",
-          "--test-realm",
+        [
+          "./third_party/fuchsia/test_scripts/test/run_executable_test.py",
+          "--test-name=fuchsia-pkg://fuchsia.com/dart_test_$mode#meta/dart_test_component.cm",
           // VmexResource not available in default hermetic realm
           // TODO(38752): Setup a Dart test realm.
-          "/core/testing:system-tests",
-          "--logs-dir",
-          _tempDirectoryOf("logs"),
-          "--package-deps",
-          _testPackagePath(buildDir, mode),
+          "--test-realm=/core/testing:system-tests",
+          "--out-dir=${_outDir(buildDir, mode)}",
+          "--package-deps=dart_test_$mode.far",
           ...arguments
-        ]),
-        envs);
-  }
-
-  static String _testPackageName(String mode) {
-    return "dart_test_$mode";
-  }
-
-  static String _testPackagePath(String buildDir, String mode) {
-    var farName = _testPackageName(mode);
-    return "$buildDir/gen/$farName/$farName.far";
+        ],
+        environmentOverrides);
   }
 
-  static String _tempDirectoryOf(String name) {
-    return tmpRoot + name;
-  }
-
-  List<String> _runArgs(String script, List<String> args) {
-    return [testScriptRoot + script, ...args];
-  }
-
-  /// Executes a test script inside of third_party/fuchsia/test_scripts/test/
-  /// with the required environment setup and the arguments.
-  Future<Process> _run(String script, List<String> args) async {
-    var newArgs = _runArgs(script, args);
-    print("+ Start $withEnv with $newArgs with environment $envs.");
-    return Process.start(withEnv, newArgs, environment: envs);
-  }
-
-  /// Executes a test script and asserts its return code is 0; see _run and
-  /// _assert.
-  Future<void> _assertRun(String script, List<String> args) async {
-    _assert((await (await _run(script, args)).exitCode) == 0);
+  // Tears down the Fuchsia environment.
+  Future<void> stop() async {
+    publisher!.kill();
+    await publisher!.exitCode;
+    publisher = null;
+    daemonIsolateDir!.deleteSync(recursive: true);
+    daemonIsolateDir = null;
   }
 
-  /// Captures the first line of output in utf8.
-  Future<String> _captureStdout(Process proc) async {
-    // The stderr needs to be fully consumed as well.
-    proc.stderr.transform(utf8.decoder).forEach((x) => stderr.write(x));
-    return (await proc.stdout.transform(utf8.decoder).first).trim();
+  Future<bool> _isProcessRunning(Process proc, int waitMs) async {
+    try {
+      await proc.exitCode.timeout(Duration(milliseconds: waitMs));
+      return false;
+    } on TimeoutException {
+      return true;
+    }
   }
 
-  /// Unlike assert keyword, always evaluates the input function and throws
-  /// exception when the evaluated result is false.
-  void _assert(bool condition) {
-    if (!condition) {
-      throw AssertionError();
-    }
+  String _outDir(String buildDir, String mode) {
+    return "$buildDir/gen/dart_test_$mode";
   }
 
   static final FuchsiaEmulator _instance = _create();

pkg/test_runner/lib/src/runtime_configuration.dart

@@ -533,15 +533,15 @@ class DartkFuchsiaEmulatorRuntimeConfiguration
             argument.replaceAll(Directory.current.path, "pkg/data"))
         .toList();
 
-    var command = FuchsiaEmulator.instance().getTestCommand(
-        _configuration.buildDirectory,
-        _configuration.mode.name,
-        _configuration.architecture.name,
-        arguments);
-    command.arguments
-        .insert(command.arguments.length - 1, '--disable-dart-dev');
-    command.environmentOverrides.addAll(environmentOverrides);
-    return [command];
+    arguments.insert(arguments.length - 1, '--disable-dart-dev');
+    return [
+      FuchsiaEmulator.instance().getTestCommand(
+          _configuration.buildDirectory,
+          _configuration.mode.name,
+          _configuration.architecture.name,
+          arguments,
+          environmentOverrides)
+    ];
   }
 }