makeTest: don't rely on makeWrapper not quoting newlines

abbradar · Mar 20, 2017 · 4b36413 · 4b36413
1 parent 47af8ce
commit 4b36413
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
@@ -108,7 +108,9 @@ 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))
+          # Somehow arrays break makeProgram if passed as arguments.
+          vms="''${vms[@]}"
           wrapProgram $out/bin/nixos-test-driver \
             --add-flags "$vms" \
             ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \