2
0
Fork 0

Checks: add sotest builder

This commit is contained in:
Emery Hemingway 2020-01-20 18:29:56 +01:00
parent 3b9d3aa99f
commit 7be2a6f17e
3 changed files with 18 additions and 7 deletions

View File

@ -24,10 +24,16 @@ let
inherit apps system testPkgs hostPkgs lib depot;
}).callTest;
sotest-nova = (call: ((tests call) // { pci = call ./pci.nix { }; }))
(import ./driver-sotest-nova.nix {
inherit apps system testPkgs hostPkgs lib depot;
}).callTest;
testsToList = tests:
map (test: {
inherit (test) name;
value = test;
}) (builtins.attrValues tests);
in with builtins; listToAttrs (concatLists (map (testsToList) [ linux nova ]))
in with builtins;
listToAttrs (concatLists (map (testsToList) [ linux nova sotest-nova ]))

View File

@ -13,16 +13,14 @@ let
SOTEST_PRODUCER_MANIFEST = testPkgs.sotest-producer.manifest;
} // env;
image = apps.nova-image.function env'
"${./driver-nova-config.dhall} ${testConfig}";
drv = hostPkgs.runCommand "nova-${name}-sotest" env' ''
${apps.nova-image.program} image.elf \
${./driver-nova-config.dhall} ${testConfig}
cp "${testPkgs.bender}" bender
cp "${testPkgs.NOVA}/hypervisor-x86_64" hypervisor
cp "${image}" image.elf
mkdir -p $out/nix-support
${hostPkgs.zip}/bin/zip "$out/binaries.zip" \
bender hypervisor-x86_64 image.elf
bender hypervisor image.elf
${apps.dhall-to-yaml.program} < ${
./sotest_config.dhall
} > "$out/sotest_config.yaml"
@ -31,7 +29,6 @@ let
'';
in drv // {
inherit image;
config = hostPkgs.runCommand (name + ".dhall") env' ''
${apps.dhall.program} <<< "(${
./driver-nova-config.dhall

View File

@ -0,0 +1,8 @@
{ boot_items =
[ { exec = "bender"
, load = [ "hypervisor serial novga iommu", "image.elf" ]
, name = "NOVA with Genode"
}
]
, boot_panic_patterns = [ "Error: init", "PAGE-FAULT IN CORE" ]
}