From 23193460fad76d4176882c70cfd5a93ef6469dd0 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Tue, 28 Jan 2020 00:41:35 +0100 Subject: [PATCH] Remove fs_report test Nix flake check should always succeed for the master checkout, but this test was always broken. --- tests/default.nix | 1 - tests/fs_report.dhall | 93 ------------------------------------------- tests/fs_report.nix | 15 ------- 3 files changed, 109 deletions(-) delete mode 100644 tests/fs_report.dhall delete mode 100644 tests/fs_report.nix diff --git a/tests/default.nix b/tests/default.nix index 9b24a30..eca768e 100644 --- a/tests/default.nix +++ b/tests/default.nix @@ -3,7 +3,6 @@ let tests = call: { - fs_report = call ./fs_report.nix { }; log = call ./log.nix { }; signal = call ./signal.nix { }; } // call ./solo5 { }; diff --git a/tests/fs_report.dhall b/tests/fs_report.dhall deleted file mode 100644 index 5a062a4..0000000 --- a/tests/fs_report.dhall +++ /dev/null @@ -1,93 +0,0 @@ --- SPDX-License-Identifier: CC0-1.0 - -let Genode = env:DHALL_GENODE - -in { config = - Genode.Init::{ - , verbose = True - , children = - toMap - { ram_fs = - Genode.Init.Start::{ - , binary = "ram_fs" - , resources = { caps = 96, ram = Genode.units.MiB 4 } - , provides = [ "File_system" ] - , config = - Some - ( Genode.Prelude.XML.text - '' - - - - - - - - - - - - - '' - ) - } - , fs_report = - Genode.Init.Start::{ - , binary = "fs_report" - , resources = { caps = 96, ram = Genode.units.MiB 4 } - , provides = [ "Report" ] - , routes = - [ Genode.ServiceRoute.child "File_system" "ram_fs" ] - , config = - Some - ( Genode.Prelude.XML.text - " " - ) - } - , fs_rom = - Genode.Init.Start::{ - , binary = "fs_rom" - , resources = { caps = 96, ram = Genode.units.MiB 4 } - , provides = [ "ROM" ] - , routes = - [ Genode.ServiceRoute.child "File_system" "ram_fs" ] - } - , test-fs_report = - Genode.Init.Start::{ - , binary = "test-fs_report" - , exitPropagate = True - , resources = { caps = 96, ram = Genode.units.MiB 4 } - , provides = [ "Report" ] - , config = - Some - ( Genode.Prelude.XML.text - " " - ) - , routes = - [ Genode.ServiceRoute.childLabel - "ROM" - "fs_rom" - (Some "devices") - (None Text) - , Genode.ServiceRoute.childLabel - "ROM" - "fs_rom" - (Some "focus") - (None Text) - , Genode.ServiceRoute.child "Report" "fs_report" - , Genode.ServiceRoute.parent "Timer" - ] - } - } - } - , rom = - let manifest = env:MANIFEST - - in Genode.Boot.toRomPaths - [ manifest.os.bin.fs_report - , manifest.os.bin.fs_rom - , manifest.os.bin.ram_fs - , manifest.os.bin.test-fs_report - , manifest.os.lib.vfs - ] - } diff --git a/tests/fs_report.nix b/tests/fs_report.nix deleted file mode 100644 index 238d849..0000000 --- a/tests/fs_report.nix +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-License-Identifier: CC0-1.0 - -{ testEnv, pkgs, ... }: -with pkgs; - -testEnv.mkTest { - name = "fs_report"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ehmry ]; - - testConfig = ./fs_report.dhall; - - testScript = '' - run_genode_until {child "test-fs_report" exited with exit value 0} 15 - ''; -}