ehmry/genodepkgs
ehmry
/
genodepkgs
2
0
Fork 0
Code Releases Activity

Run Linux tests under SOTEST for consistency

This commit is contained in:
Ehmry - 2020-02-19 13:37:29 +01:00
parent d37bff8d16
commit a2fc8f8ed1
2 changed files with 65 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
tests/driver-linux-config.dhall
View File

@ -1,14 +1,13 @@
-- SPDX-License-Identifier: CC0-1.0
let Genode = env:DHALL_GENODE
let Args =
{ config : Genode.Init.Type
, rom : Genode.Prelude.Map.Type Text Genode.Boot.Rom
}
: Type
let Prelude = Genode.Prelude
in λ(args : Args)
→ { config =
in λ(boot : Genode.Boot.Type)
→ let child =
{ mapKey = "test", mapValue = Genode.Init.toStart boot.config }
in { config =
Genode.Init::{
, verbose = True
, defaultRoutes =
@ -23,18 +22,49 @@ in λ(args : Args)
, provides = [ "Timer" ]
}
}
, { mapKey = "test", mapValue = Genode.Init.toStart args.config }
, { mapKey = "harness"
, mapValue =
Genode.Init.Start::{
, binary = "sotest-harness"
, exitPropagate = True
, resources =
{ caps = child.mapValue.resources.caps + 128
, ram =
child.mapValue.resources.ram
+ Genode.units.MiB 1
}
, config =
Some
( Prelude.XML.element
{ name = "config"
, attributes = Prelude.XML.emptyAttributes
, content =
[ Genode.Init.Start.toXML
child.mapKey
child.mapValue
]
}
)
, routes =
[ Genode.ServiceRoute.parentLabel
"LOG"
(Some "SOTEST")
(Some "unlabeled")
]
}
}
]
}
, rom =
let manifest = env:MANIFEST
in Genode.Boot.toRomPaths
[ manifest.base-linux.bin.ld
[ manifest.base-linux.bin.core-linux
, manifest.base-linux.bin.ld
, manifest.base-linux.bin.linux_timer_drv
, manifest.os.bin.init
, manifest.base-linux.bin.core-linux
, manifest.sotest-producer.bin.sotest-harness
]
# args.rom
# boot.rom
: Genode.Prelude.Map.Type Text Genode.Boot.Rom
}

2
tests/driver-linux.nix
View File

@ -42,7 +42,7 @@ let
DHALL_PRELUDE = "${testPkgs.dhallPrelude}/package.dhall";
DHALL_GENODE = "${testPkgs.dhallGenode}/package.dhall";
MANIFEST = lib.mergeManifests (with testPkgs;
[ genode.base-linux genode.os ] ++ testInputs);
[ genode.base-linux genode.os sotest-producer ] ++ testInputs);
} // env;
toExports = env: