From 61b8d27b4ce60b18778505d0ca26fdaaf5a5745a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 19 Jun 2016 13:38:46 +0200 Subject: [PATCH] make-wrapper: fixup #14753 changes to make tests work The tests need to expand passed variable and very carefully. I could see no other easy way than to change single-quoting in makeWrapper to double-quoting. The tests now fail with the same problem as on master... --- nixos/lib/testing.nix | 8 ++++---- pkgs/build-support/setup-hooks/make-wrapper.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index f7159634e4f..5f463c09284 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"} ''; # " diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh index d3db0b64bd5..d922db5ccf5 100644 --- a/pkgs/build-support/setup-hooks/make-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-wrapper.sh @@ -16,7 +16,7 @@ makeWrapper() { varName=${params[$((n + 1))]} value=${params[$((n + 2))]} n=$((n + 2)) - echo "export $varName='$value'" >> $wrapper + echo "export $varName=\"$value\"" >> $wrapper fi if test "$p" = "--unset"; then