From d2f265f8069be3c06798a43542b574bcb99da0a6 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Wed, 14 Apr 2021 17:57:59 +0200 Subject: [PATCH] WiP graphics test: fuck the backdrop --- tests/graphics.nix | 35 +++++++++++++++++------------------ tests/watermark.dhall | 37 ------------------------------------- 2 files changed, 17 insertions(+), 55 deletions(-) delete mode 100644 tests/watermark.dhall diff --git a/tests/graphics.nix b/tests/graphics.nix index d4e59cc..bdeed69 100644 --- a/tests/graphics.nix +++ b/tests/graphics.nix @@ -1,27 +1,26 @@ { - name = "tor"; + name = "graphics"; machine = { config, lib, pkgs, ... }: { - virtualisation.memorySize = 768; - genode.gui.consoleLog.enable = true; - genode.core.storeBackend = "fs"; - hardware.genode.usb.enable = true; - hardware.genode.usb.storage.enable = true; - services.tor = { - # enable = true; - client.enable = false; - extraConfig = '' - Log [general,net,config,fs]debug stdout - ''; - relay = { - enable = true; - port = 80; - role = "relay"; - bridgeTransports = [ ]; - }; + genode.core.storeBackend = "fs"; + hardware.genode.framebuffer.driver = "boot"; + hardware.genode.usb = { + enable = true; + biosHandoff = false; + storage.enable = true; + }; + + genode.init.verbose = true; + genode.init.children.hello = { + package = pkgs.hello; + configFile = ./hello.dhall; }; }; + testScript = '' + start_all() + machine.wait_until_serial_output("child \"init\" exited with exit value 0") + ''; } diff --git a/tests/watermark.dhall b/tests/watermark.dhall deleted file mode 100644 index ca6b954..0000000 --- a/tests/watermark.dhall +++ /dev/null @@ -1,37 +0,0 @@ -let Sigil = env:DHALL_SIGIL - -let Init = Sigil.Init - -let Child = Init.Child - -let Libc = Sigil.Libc - -in λ(binary : Text) → - Child.flat - Child.Attributes::{ - , binary - , resources = Sigil.Init.Resources::{ - , caps = 256 - , ram = Sigil.units.MiB 16 - } - , config = - let cfg = - Libc.toConfig - Libc::{ - , rtc = None Text - , vfs = - [ VFS.dir "dev" [ VFS.leaf "null", VFS.leaf "log" ] - , VFS.leafAttrs "rom" (toMap { name = "backdrop.png" }) - ] - } - - in cfg - with content = - cfg.content - # [ XML.leaf - { name = "image" - , attributes = toMap - { png = "backdrop.png", anchor = "bottomright" } - } - ] - }