JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nixos/test: Fix child environment of python driver

Browse Source
This commit is contained in:
Jacek Galowicz 2019-11-19 12:59:14 +01:00 committed by Florian Klink
parent 783184f772
commit 67e2042861
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/lib/test-driver/test-driver.py
View File

@ -606,12 +606,15 @@ class Machine:
+ os.environ.get("QEMU_OPTS", "") + os.environ.get("QEMU_OPTS", "")
) )
environment = { environment = dict(os.environ)
"QEMU_OPTS": qemu_options, environment.update(
{
"TMPDIR": self.state_dir,
"SHARED_DIR": self.shared_dir, "SHARED_DIR": self.shared_dir,
"USE_TMPDIR": "1", "USE_TMPDIR": "1",
"QEMU_OPTS": qemu_options,
} }
environment.update(dict(os.environ)) )
self.process = subprocess.Popen( self.process = subprocess.Popen(
self.script, self.script,