From b4e2b6bc6aac50094dad02a01d34d0aaca7eb3f4 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 11 Sep 2016 17:27:07 +0200
Subject: 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>
---
 nixos/lib/testing.nix | 6 ++++--
 1 file 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
       ''; # */
-- 
cgit 1.4.1