diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-11-24 18:29:15 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-11-24 18:36:54 +0100 |
| commit | 7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e (patch) | |
| tree | addea6c250c34b29acb432fd2602b58922771868 /nixos | |
| parent | 1743953cc5dee3ec78d1769ec5edff18a27607cb (diff) | |
| parent | 9ae72f2715d800f25f7dca0dec69624968d52909 (diff) | |
| download | nixpkgs-7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e.tar nixpkgs-7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e.tar.gz nixpkgs-7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e.tar.bz2 nixpkgs-7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e.tar.lz nixpkgs-7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e.tar.xz nixpkgs-7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e.tar.zst nixpkgs-7dfa97969a3d8ca0bce2c0d19bafbacd0f4b9c3e.zip | |
Merge branch 'staging' (older one)
Hydra seems OK-ish, except that some aarch64 jobs need restarting after qt4 timing out for the first time: https://hydra.nixos.org/eval/1412641?compare=1412561
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/lib/testing.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 9339ba78ff0..532fff681d3 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -113,8 +113,7 @@ rec { --add-flags "''${vms[*]}" \ ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin:${imagemagick}/bin'"} \ - --run "testScript=\"\$(cat $out/test-script)\"" \ - --set testScript '$testScript' \ + --run "export testScript=\"\$(cat $out/test-script)\"" \ --set VLANS '${toString vlans}' ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms wrapProgram $out/bin/nixos-run-vms \ |