From 949ae2a90114d9312f61f683682d524a7fa85bc8 Mon Sep 17 00:00:00 2001
From: Yilong Li <liyl@google.com>
Date: Tue, 30 Mar 2021 01:19:38 -0700
Subject: [PATCH] fuchsia: Allow access to system services in tests.

Per https://fuchsia.dev/fuchsia-src/concepts/testing/v1_test_component,
in order to access non-basic system services like Vulkan loader and
sysmem allocator, we need to add "system-services" field to the cmx
metadata file.

Unittests like "shell_test" requires Vulkan to run properly, so we
add Vulkan loader and sysmem services; for Flutter runner tests,
we also need to add fuchsia.ui.scenic.Scenic since the test needs
to create a Scenic session as well.

TEST=shell_tests (SkpWarmupTest.Basic/SkpWarmupTest.Image)
     flutter_runner_tests (EngineTest.SkpWarmUp) on FEMU
---
 .../fuchsia/flutter/meta/flutter_runner_tests.cmx    | 12 +++++++++++-
 testing/fuchsia/meta/fuchsia_test.cmx                |  8 ++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/shell/platform/fuchsia/flutter/meta/flutter_runner_tests.cmx b/shell/platform/fuchsia/flutter/meta/flutter_runner_tests.cmx
index 3c7c6b19e1079..155be56e9bf21 100644
--- a/shell/platform/fuchsia/flutter/meta/flutter_runner_tests.cmx
+++ b/shell/platform/fuchsia/flutter/meta/flutter_runner_tests.cmx
@@ -5,6 +5,15 @@
        "ICU_TIMEZONE_FILES_DIR=/pkg/data/tzdata"
     ]
   },
+  "facets": {
+    "fuchsia.test": {
+      "system-services": [
+        "fuchsia.sysmem.Allocator",
+        "fuchsia.ui.scenic.Scenic",
+        "fuchsia.vulkan.loader.Loader"
+      ]
+    }
+  },
   "sandbox": {
     "features": [
       "deprecated-ambient-replace-as-executable",
@@ -18,7 +27,8 @@
       "fuchsia.process.Launcher",
       "fuchsia.vulkan.loader.Loader",
       "fuchsia.logger.LogSink",
-      "fuchsia.sysmem.Allocator"
+      "fuchsia.sysmem.Allocator",
+      "fuchsia.ui.scenic.Scenic"
     ]
   }
 }
diff --git a/testing/fuchsia/meta/fuchsia_test.cmx b/testing/fuchsia/meta/fuchsia_test.cmx
index 89af09f157d5f..8b72b155c4225 100644
--- a/testing/fuchsia/meta/fuchsia_test.cmx
+++ b/testing/fuchsia/meta/fuchsia_test.cmx
@@ -2,6 +2,14 @@
   "program": {
     "binary": "bin/app"
   },
+  "facets": {
+    "fuchsia.test": {
+      "system-services": [
+        "fuchsia.sysmem.Allocator",
+        "fuchsia.vulkan.loader.Loader"
+      ]
+    }
+  },
   "sandbox": {
     "features": [
       "vulkan",