diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2016-09-11 17:27:07 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2016-09-11 17:31:12 +0200 |
| commit | b4e2b6bc6aac50094dad02a01d34d0aaca7eb3f4 (patch) | |
| tree | 17e3a618a14a6d8ef66a236f39fd91d5d996b93e /nixos/lib/testing.nix | |
| parent | 38ae858e2811f12279dd3dca49e9c3e82dc3900d (diff) | |
| download | nixlib-b4e2b6bc6aac50094dad02a01d34d0aaca7eb3f4.tar nixlib-b4e2b6bc6aac50094dad02a01d34d0aaca7eb3f4.tar.gz nixlib-b4e2b6bc6aac50094dad02a01d34d0aaca7eb3f4.tar.bz2 nixlib-b4e2b6bc6aac50094dad02a01d34d0aaca7eb3f4.tar.lz nixlib-b4e2b6bc6aac50094dad02a01d34d0aaca7eb3f4.tar.xz nixlib-b4e2b6bc6aac50094dad02a01d34d0aaca7eb3f4.tar.zst nixlib-b4e2b6bc6aac50094dad02a01d34d0aaca7eb3f4.zip | |
nixos/lib/testing: Fix unsetting $xchg
Regression introduced by 4dcb685af940efd74a7b2b66ae917129ef232d83. Unsetting the environment variable shortly before using it is not going to end up very well, so let's just filter out the variable from the output of export and unset it shortly afterwards. This fixes the runInMachine NixOS test. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'nixos/lib/testing.nix')
| -rw-r--r-- | nixos/lib/testing.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 109959cd5126..7fad5cbc3cd9 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -181,9 +181,11 @@ rec { eval $i2=/tmp/xchg/$_basename ${coreutils}/bin/ls -la $xchg done - unset i i2 _basename xchg - export > $xchg/saved-env + unset i i2 _basename + export | ${gnugrep}/bin/grep -v '^xchg=' > $xchg/saved-env + unset xchg + export tests='${testScript}' ${testDriver}/bin/nixos-test-driver ${vm.config.system.build.vm}/bin/run-*-vm ''; # */ |