[dash] Remove dash/ELF runner integration test
This test is highly dependent on stdout, which is going away, and covers
cases already handled by the elf-runner-test integration test.
Change-Id: Ia6fc3adb1453644e3823601c0555dae3853a46df
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/376275
Reviewed-by: Bryan Henry <bryanhenry@google.com>
Reviewed-by: Gary Bressler <geb@google.com>
Commit-Queue: Derek Gonyeo <dgonyeo@google.com>
Testability-Review: Fady Samuel <fsamuel@google.com>
diff --git a/garnet/packages/experimental/BUILD.gn b/garnet/packages/experimental/BUILD.gn
index c868ddb..d2fa504 100644
--- a/garnet/packages/experimental/BUILD.gn
+++ b/garnet/packages/experimental/BUILD.gn
@@ -32,7 +32,6 @@
public_deps = [
"//src/devices/bin/driver_manager",
"//src/sys/component_manager",
- "//src/sys/dash",
]
}
diff --git a/src/sys/BUILD.gn b/src/sys/BUILD.gn
index 465ff536..10fc602 100644
--- a/src/sys/BUILD.gn
+++ b/src/sys/BUILD.gn
@@ -22,7 +22,6 @@
"component_index:tests",
"component_manager:tests",
"component_manager_for_test:tests",
- "dash:tests",
"device_settings:tests",
"gtest_v1_runner:tests",
"lib:tests",
diff --git a/src/sys/dash/BUILD.gn b/src/sys/dash/BUILD.gn
deleted file mode 100644
index 045147f..0000000
--- a/src/sys/dash/BUILD.gn
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2019 The Fuchsia Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/fuchsia/zircon_images.gni")
-import("//build/images/manifest.gni")
-import("//build/package.gni")
-import("//build/package/component.gni")
-import("//build/rust/rustc_binary.gni")
-import("//build/test/test_package.gni")
-import("//build/testing/environments.gni")
-
-zircon_extras_manifest("zircon-bin-manifest") {
- visibility = [ ":*" ]
- manifest = "image"
- patterns = [ "bin/sh" ]
-}
-
-rustc_binary("dash_test_bin") {
- name = "dash_test"
- edition = "2018"
- source_root = "src/integration_test.rs"
- deps = [
- "//sdk/fidl/fuchsia.data:fuchsia.data-rustc",
- "//sdk/fidl/fuchsia.sys:fuchsia.sys-rustc",
- "//src/lib/fdio/rust:fdio",
- "//src/lib/fuchsia-async",
- "//src/lib/fuchsia-component",
- "//src/lib/fuchsia-runtime",
- "//src/lib/zircon/rust:fuchsia-zircon",
- "//third_party/rust_crates:anyhow",
- "//third_party/rust_crates:thiserror",
- ]
-}
-
-test_package("dash_test") {
- deps = [
- ":dash_test_bin",
- ":zircon-bin-manifest",
- "//examples/components/basic:hello_world_bin",
- ]
-
- components = [
- "//src/sys/component_manager:component_manager_as_v1_component",
- ":dash_component",
- ]
-
- extra = get_target_outputs(":zircon-bin-manifest")
-
- binaries = [
- {
- name = "hello_world"
- },
- ]
-
- tests = [
- {
- name = "dash_test"
- dest = "dash_test"
- environments = basic_envs
- },
- ]
-}
-
-package("dash") {
- deps = [
- ":zircon-bin-manifest",
- "//examples/components/basic:hello_world_bin",
- ]
-
- components = [ ":dash_component" ]
-
- extra = get_target_outputs(":zircon-bin-manifest")
-
- binaries = [
- {
- name = "hello_world"
- },
- ]
-}
-
-deprecated_fuchsia_component("dash_component") {
- manifest = rebase_path("meta/dash_hello.cml")
-}
-
-group("tests") {
- testonly = true
-
- deps = [ ":dash_test" ]
-}
diff --git a/src/sys/dash/meta/dash_hello.cml b/src/sys/dash/meta/dash_hello.cml
deleted file mode 100644
index d55c5da..0000000
--- a/src/sys/dash/meta/dash_hello.cml
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "program": {
- "binary": "bin/sh",
- "args": [ "-c", "/pkg/bin/hello_world" ]
- },
- "use": [
- { "runner": "elf" },
- {
- "protocol": "/svc/fuchsia.process.Launcher",
- "as": "/svc/fuchsia.process.Launcher",
- },
- ]
-}
diff --git a/src/sys/dash/meta/dash_test.cmx b/src/sys/dash/meta/dash_test.cmx
deleted file mode 100644
index 4fadebd..0000000
--- a/src/sys/dash/meta/dash_test.cmx
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "facets": {
- "fuchsia.test": {
- "injected-services": {
- "fuchsia.pkg.PackageResolver": "fuchsia-pkg://fuchsia.com/dash_test#meta/mock_pkg_resolver.cmx"
- }
- }
- },
- "program": {
- "binary": "test/dash_test"
- },
- "sandbox": {
- "services": [
- "fuchsia.pkg.PackageResolver",
- "fuchsia.process.Launcher",
- "fuchsia.sys.Launcher"
- ]
- }
-}
diff --git a/src/sys/dash/src/integration_test.rs b/src/sys/dash/src/integration_test.rs
deleted file mode 100644
index 5f5b174..0000000
--- a/src/sys/dash/src/integration_test.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2019 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-use anyhow::Error;
-use fidl_fuchsia_sys::FileDescriptor;
-use fuchsia_async as fasync;
-use fuchsia_component::client::{launch_with_options, launcher, LaunchOptions};
-use fuchsia_runtime::HandleType;
-use std::io::{BufRead, BufReader};
-
-#[fasync::run_singlethreaded]
-async fn main() -> Result<(), Error> {
- let (pipe, socket) = fdio::pipe_half()?;
- let mut launch_options = LaunchOptions::new();
- launch_options.set_out(FileDescriptor {
- type0: HandleType::FileDescriptor as i32,
- type1: 0,
- type2: 0,
- handle0: Some(socket.into()),
- handle1: None,
- handle2: None,
- });
-
- let launcher = launcher().expect("Failed to open launcher service");
- let _app = launch_with_options(
- &launcher,
- "fuchsia-pkg://fuchsia.com/dash_test#meta/component_manager.cmx".to_string(),
- Some(vec!["fuchsia-pkg://fuchsia.com/dash_test#meta/dash_hello.cm".to_string()]),
- launch_options,
- )
- .expect("Failed to launch component_manager with dash_hello");
-
- let mut reader = BufReader::new(pipe);
-
- // Assert component manager as a v1 component was able to launch dash as a v2 component was
- // able to launch hello world as a binary.
- let mut line = String::new();
- reader.read_line(&mut line)?;
- assert_eq!(line, "Hippo: Hello World!\n");
-
- Ok(())
-}
