diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-19 13:38:46 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-19 13:38:46 +0200 |
| commit | 61b8d27b4ce60b18778505d0ca26fdaaf5a5745a (patch) | |
| tree | af288c1dbfa98625697665fa9983b35a21fff71e /nixos/lib/testing.nix | |
| parent | e75740455546f85cbf9849907b1f6520fdb487d8 (diff) | |
| download | nixlib-61b8d27b4ce60b18778505d0ca26fdaaf5a5745a.tar nixlib-61b8d27b4ce60b18778505d0ca26fdaaf5a5745a.tar.gz nixlib-61b8d27b4ce60b18778505d0ca26fdaaf5a5745a.tar.bz2 nixlib-61b8d27b4ce60b18778505d0ca26fdaaf5a5745a.tar.lz nixlib-61b8d27b4ce60b18778505d0ca26fdaaf5a5745a.tar.xz nixlib-61b8d27b4ce60b18778505d0ca26fdaaf5a5745a.tar.zst nixlib-61b8d27b4ce60b18778505d0ca26fdaaf5a5745a.zip | |
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...
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"} ''; # " |