From ccdfcd7a5bfa7bd79eb98fca06bc06f28f734934 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 28 Oct 2019 07:23:13 +0100 Subject: [PATCH] Set preferLocalBuild for tests --- tests/driver-linux.nix | 4 ++-- tests/driver-nova.nix | 4 ++-- tests/nova-iso.nix | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/driver-linux.nix b/tests/driver-linux.nix index 2f29d2e..fa9cf23 100644 --- a/tests/driver-linux.nix +++ b/tests/driver-linux.nix @@ -8,13 +8,12 @@ let testDriver = with hostPkgs; stdenv.mkDerivation { name = "genode-test-driver"; + preferLocalBuild = true; buildInputs = [ makeWrapper expect ]; dontUnpack = true; - preferLocalBuild = true; - installPhase = '' install -Dm555 ${./test-driver.exp} $out/bin/genode-test-driver wrapProgram $out/bin/genode-test-driver \ @@ -25,6 +24,7 @@ let runTests = driver: hostPkgs.stdenv.mkDerivation { name = "test-run-${driver.testName}"; + preferLocalBuild = true; buildCommand = '' mkdir -p $out/nix-support diff --git a/tests/driver-nova.nix b/tests/driver-nova.nix index 6978ec2..86e3270 100644 --- a/tests/driver-nova.nix +++ b/tests/driver-nova.nix @@ -8,13 +8,12 @@ let testDriver = with hostPkgs; stdenv.mkDerivation { name = "nova-genode-test-driver"; + preferLocalBuild = true; buildInputs = [ makeWrapper expect ]; dontUnpack = true; - preferLocalBuild = true; - installPhase = '' install -Dm555 ${./nova-test-driver.exp} $out/bin/genode-test-driver wrapProgram $out/bin/genode-test-driver \ @@ -25,6 +24,7 @@ let runTests = driver: hostPkgs.stdenv.mkDerivation { name = "test-run-${driver.testName}"; + preferLocalBuild = true; buildCommand = '' mkdir -p $out/nix-support diff --git a/tests/nova-iso.nix b/tests/nova-iso.nix index 8219388..9771bb6 100644 --- a/tests/nova-iso.nix +++ b/tests/nova-iso.nix @@ -62,6 +62,7 @@ let in hostPkgs.stdenv.mkDerivation { name = "nova-genode.iso"; + preferLocalBuild = true; buildInputs = [ testPkgs.stdenv.cc hostPkgs.cdrkit ]; dontUnpack = true; dontConfigure = true;