commit 756d16b39b9cbb4c821f7826fefff6a734ac1092
author Ankur Mittal <anmittal@google.com> Tue May 05 19:05:57 2020 +0000
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Tue May 05 19:05:57 2020 +0000
tree f1d7a57a171eaf3bac252a81b26861f753691d4a
parent 580103086666b87d23abbbb7e71450a820146782

[session_shells] Port to rust test runner

Port for rust test adapter

Change-Id: I3cc3088f414ad58f753980371b8a45ecc1da1ee7
Reviewed-on: https://fuchsia-review.googlesource.com/c/experiences/+/386474
Reviewed-by: Kevin Lindkvist <lindkvist@google.com>
Testability-Review: Kevin Lindkvist <lindkvist@google.com>
Commit-Queue: Ankur Mittal <anmittal@google.com>

session_shells/ermine/session/BUILD.gn

diff --git a/session_shells/ermine/session/BUILD.gn b/session_shells/ermine/session/BUILD.gn
index 926c723..d8eef43 100644
--- a/session_shells/ermine/session/BUILD.gn
+++ b/session_shells/ermine/session/BUILD.gn
@@ -72,16 +72,12 @@
   deps = [
     ":bin",
     ":bin_test",
-    "//src/sys/test_adapters/rust",
   ]
 
   binaries = [
     {
       name = "workstation_session"
     },
-    {
-      name = "rust_test_adapter"
-    },
   ]
 
   meta = [

session_shells/ermine/session/meta/workstation_session_bin_test.cml

diff --git a/session_shells/ermine/session/meta/workstation_session_bin_test.cml b/session_shells/ermine/session/meta/workstation_session_bin_test.cml
index 54ef237..f52ccee 100644
--- a/session_shells/ermine/session/meta/workstation_session_bin_test.cml
+++ b/session_shells/ermine/session/meta/workstation_session_bin_test.cml
@@ -1,27 +1,21 @@
 {
     program: {
-        binary: "bin/rust_test_adapter",
-        args: [
-            "/pkg/test/workstation_session_bin_test",
-        ]
+        binary: "test/workstation_session_bin_test",
     },
-    expose: [
-        {
-            protocol: "/svc/fuchsia.test.Suite",
-            from: "self",
-       },
-    ],
     use: [
-        { runner: "elf" },
+        { runner: "rust_test_runner" },
         {
             protocol: "/svc/fuchsia.sys2.Realm",
             from: "realm",
         },
         {
-            protocol: [
-                "/svc/fuchsia.process.Launcher",
-                "/svc/fuchsia.logger.LogSink",
-            ]
+            protocol: [ "/svc/fuchsia.logger.LogSink" ],
+        },
+    ],
+    expose: [
+        {
+            protocol: "/svc/fuchsia.test.Suite",
+            from: "self",
         },
     ],
 }