Carry a patch for the test driver instead of vendoring all the code.
This commit is contained in:
parent
22684b6ed6
commit
9b62e4668b
11 changed files with 103 additions and 1728 deletions
13
nix/lib.nix
13
nix/lib.nix
|
|
@ -364,9 +364,16 @@ in
|
|||
]};
|
||||
'';
|
||||
|
||||
# We vendor the test-driver until github.com/NixOS/nixpkgs#228220 gets merged
|
||||
#test-driver = pkgs.callPackage "${nixpkgs}/nixos/lib/test-driver" { };
|
||||
test-driver = hostPkgs.callPackage ../test/nixos-test-driver { };
|
||||
test-driver =
|
||||
let
|
||||
upstream = hostPkgs.callPackage "${nixpkgs}/nixos/lib/test-driver" { };
|
||||
in
|
||||
upstream.overrideAttrs (_: {
|
||||
# github.com/NixOS/nixpkgs#228220 gets merged
|
||||
patches = [
|
||||
../test/0001-nixos-test-driver-include-a-timeout-for-the-recv-cal.patch
|
||||
];
|
||||
});
|
||||
|
||||
runTest = { nodes, vlans, testScript, extraDriverArgs }: ''
|
||||
${lib.getBin test-driver}/bin/nixos-test-driver \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue