Make "config" and "iso" test attributes accessible
This commit is contained in:
parent
a3f8d20d23
commit
504f59716c
|
@ -25,6 +25,7 @@ let
|
||||||
|
|
||||||
renderDhallInit = path: args:
|
renderDhallInit = path: args:
|
||||||
hostPkgs.runCommand "init.xml" {
|
hostPkgs.runCommand "init.xml" {
|
||||||
|
preferLocalBuild = true;
|
||||||
buildInputs = [ hostPkgs.dhall ];
|
buildInputs = [ hostPkgs.dhall ];
|
||||||
initConfig = path;
|
initConfig = path;
|
||||||
initArgs = args;
|
initArgs = args;
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
<service name="RM"/>
|
<service name="RM"/>
|
||||||
<service name="CPU"/>
|
<service name="CPU"/>
|
||||||
<service name="LOG"/>
|
<service name="LOG"/>
|
||||||
|
<service name="TRACE"/>
|
||||||
</parent-provides>
|
</parent-provides>
|
||||||
<default-route>
|
<default-route>
|
||||||
<any-service>
|
<any-service>
|
||||||
|
|
|
@ -91,18 +91,19 @@ let
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
global spawn_id
|
||||||
|
spawn ${hostPkgs.qemu_test}/bin/qemu-system-x86_64 -cdrom ${iso} -nographic \
|
||||||
|
-m size=${toString qemuMem}
|
||||||
|
wait_for_output $wait_for_re $timeout_value $spawn_id
|
||||||
|
}
|
||||||
|
|
||||||
|
# TODO: not in TCL
|
||||||
global env
|
global env
|
||||||
set out $env(out)
|
set out $env(out)
|
||||||
|
|
||||||
set fd [open "$out/nix-support/hydra-build-products" w]
|
set fd [open "$out/nix-support/hydra-build-products" w]
|
||||||
puts $fd "file iso ${iso}"
|
puts $fd "file iso ${iso}"
|
||||||
close $fd
|
close $fd
|
||||||
|
|
||||||
global spawn_id
|
|
||||||
spawn ${hostPkgs.qemu_test}/bin/qemu-system-x86_64 -cdrom ${iso} -nographic \
|
|
||||||
-m size=${toString qemuMem}
|
|
||||||
wait_for_output $wait_for_re $timeout_value $spawn_id
|
|
||||||
}
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
driver = with hostPkgs;
|
driver = with hostPkgs;
|
||||||
|
@ -129,7 +130,7 @@ let
|
||||||
|
|
||||||
test = passMeta (runTests driver);
|
test = passMeta (runTests driver);
|
||||||
|
|
||||||
in test // { inherit driver test; };
|
in test // { inherit driver iso test; config = testConfig; };
|
||||||
|
|
||||||
in {
|
in {
|
||||||
callTest = path: args:
|
callTest = path: args:
|
||||||
|
|
Loading…
Reference in New Issue