diff --git a/tests/default.nix b/tests/default.nix
index 1c6bc8d..a93d1cc 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -25,6 +25,7 @@ let
renderDhallInit = path: args:
hostPkgs.runCommand "init.xml" {
+ preferLocalBuild = true;
buildInputs = [ hostPkgs.dhall ];
initConfig = path;
initArgs = args;
diff --git a/tests/driver-config.xml b/tests/driver-config.xml
index 3f70ca6..77024a3 100644
--- a/tests/driver-config.xml
+++ b/tests/driver-config.xml
@@ -9,6 +9,7 @@
+
diff --git a/tests/driver-nova.nix b/tests/driver-nova.nix
index 8ca39a1..a33d6cc 100644
--- a/tests/driver-nova.nix
+++ b/tests/driver-nova.nix
@@ -91,18 +91,19 @@ let
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
set out $env(out)
set fd [open "$out/nix-support/hydra-build-products" w]
puts $fd "file iso ${iso}"
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;
@@ -129,7 +130,7 @@ let
test = passMeta (runTests driver);
- in test // { inherit driver test; };
+ in test // { inherit driver iso test; config = testConfig; };
in {
callTest = path: args: