diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-22 10:49:56 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-22 10:49:56 +0200 |
commit | c05d8295988697adbb920a7b4a999ae3670c5504 (patch) | |
tree | 7a5526cffad30206f814560c72f13829e4d9c396 /nixos/lib/testing.nix | |
parent | f073df60d60444c30c49cb26d6b187a4100b41fe (diff) | |
parent | ebf1cb28a2a9e4ef3bcdf15376af4618a1e652c7 (diff) | |
download | nixlib-c05d8295988697adbb920a7b4a999ae3670c5504.tar nixlib-c05d8295988697adbb920a7b4a999ae3670c5504.tar.gz nixlib-c05d8295988697adbb920a7b4a999ae3670c5504.tar.bz2 nixlib-c05d8295988697adbb920a7b4a999ae3670c5504.tar.lz nixlib-c05d8295988697adbb920a7b4a999ae3670c5504.tar.xz nixlib-c05d8295988697adbb920a7b4a999ae3670c5504.tar.zst nixlib-c05d8295988697adbb920a7b4a999ae3670c5504.zip |
Merge branch 'staging'
Diffstat (limited to 'nixos/lib/testing.nix')
-rw-r--r-- | nixos/lib/testing.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index f7159634e4f1..5f463c092846 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -113,14 +113,14 @@ rec { --add-flags "$vms" \ ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \ --run "testScript=\"\$(cat $out/test-script)\"" \ - --set testScript '"$testScript"' \ - --set VLANS '"${toString vlans}"' + --set testScript '$testScript' \ + --set VLANS '${toString vlans}' ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms wrapProgram $out/bin/nixos-run-vms \ --add-flags "$vms" \ ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \ - --set tests '"startAll; joinAll;"' \ - --set VLANS '"${toString vlans}"' \ + --set tests 'startAll; joinAll;' \ + --set VLANS '${toString vlans}' \ ${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"} ''; # " |