diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-29 07:47:04 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-29 07:47:04 +0200 |
| commit | 3afa2460386b1472128e302d1db13dba54e68e12 (patch) | |
| tree | 1bc0a79319449f29cbd5a1715c0135db1bed9337 /nixos | |
| parent | d9036a02b5c5ef31e18e913ce7e2eb56999d311e (diff) | |
| parent | f4792cdc0cffc0d1843f5d8bb3e458546646f67c (diff) | |
| download | nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar.gz nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar.bz2 nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar.lz nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar.xz nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar.zst nixlib-3afa2460386b1472128e302d1db13dba54e68e12.zip | |
Merge branch 'staging'
This includes a security update of expat.
Diffstat (limited to 'nixos')
| -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"} ''; # " |