diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-03-20 16:15:38 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-03-20 16:15:38 +0300 |
| commit | 1f0ce0eaf8ca840e769615acc7581bd71268ca44 (patch) | |
| tree | bd65fb73f8ce3bed7da0ec5aa816cc77bda4708d /nixos/lib | |
| parent | f5581d0221a58e1cd67fd1b1be81dc5b63bb3b3d (diff) | |
| download | nixlib-1f0ce0eaf8ca840e769615acc7581bd71268ca44.tar nixlib-1f0ce0eaf8ca840e769615acc7581bd71268ca44.tar.gz nixlib-1f0ce0eaf8ca840e769615acc7581bd71268ca44.tar.bz2 nixlib-1f0ce0eaf8ca840e769615acc7581bd71268ca44.tar.lz nixlib-1f0ce0eaf8ca840e769615acc7581bd71268ca44.tar.xz nixlib-1f0ce0eaf8ca840e769615acc7581bd71268ca44.tar.zst nixlib-1f0ce0eaf8ca840e769615acc7581bd71268ca44.zip | |
makeTest: don't rely on makeWrapper not quoting newlines
Diffstat (limited to 'nixos/lib')
| -rw-r--r-- | nixos/lib/testing.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index c1cb5072acad..8539fef0a19d 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -108,16 +108,16 @@ rec { mkdir -p $out/bin echo "$testScript" > $out/test-script ln -s ${testDriver}/bin/nixos-test-driver $out/bin/ - vms="$(for i in ${toString vms}; do echo $i/bin/run-*-vm; done)" + vms=($(for i in ${toString vms}; do echo $i/bin/run-*-vm; done)) wrapProgram $out/bin/nixos-test-driver \ - --add-flags "$vms" \ + --add-flags "''${vms[*]}" \ ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \ --run "testScript=\"\$(cat $out/test-script)\"" \ --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" \ + --add-flags "''${vms[*]}" \ ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \ --set tests 'startAll; joinAll;' \ --set VLANS '${toString vlans}' \ |