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>
This commit is contained in:
parent
38ae858e28
commit
b4e2b6bc6a
@ -181,9 +181,11 @@ rec {
|
|||||||
eval $i2=/tmp/xchg/$_basename
|
eval $i2=/tmp/xchg/$_basename
|
||||||
${coreutils}/bin/ls -la $xchg
|
${coreutils}/bin/ls -la $xchg
|
||||||
done
|
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}'
|
export tests='${testScript}'
|
||||||
${testDriver}/bin/nixos-test-driver ${vm.config.system.build.vm}/bin/run-*-vm
|
${testDriver}/bin/nixos-test-driver ${vm.config.system.build.vm}/bin/run-*-vm
|
||||||
''; # */
|
''; # */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user