diff options
| author | Jacek Galowicz <jacek.galowicz@cyberus-technology.de> | 2019-11-19 12:59:14 +0100 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2019-11-20 17:37:12 +0100 |
| commit | 67e20428612e1376d8d62df4c98d34b6af012d10 (patch) | |
| tree | d03abd4ed6e9287aa9ec86454446c8af05fd7b31 /nixos/lib/test-driver/test-driver.py | |
| parent | 783184f7724c7f340c2b76a555b42ea67c5ff670 (diff) | |
| download | nixpkgs-67e20428612e1376d8d62df4c98d34b6af012d10.tar nixpkgs-67e20428612e1376d8d62df4c98d34b6af012d10.tar.gz nixpkgs-67e20428612e1376d8d62df4c98d34b6af012d10.tar.bz2 nixpkgs-67e20428612e1376d8d62df4c98d34b6af012d10.tar.lz nixpkgs-67e20428612e1376d8d62df4c98d34b6af012d10.tar.xz nixpkgs-67e20428612e1376d8d62df4c98d34b6af012d10.tar.zst nixpkgs-67e20428612e1376d8d62df4c98d34b6af012d10.zip | |
nixos/test: Fix child environment of python driver
Diffstat (limited to 'nixos/lib/test-driver/test-driver.py')
| -rw-r--r-- | nixos/lib/test-driver/test-driver.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 9d89960876e..872e96327e8 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -606,12 +606,15 @@ class Machine: + os.environ.get("QEMU_OPTS", "") ) - environment = { - "QEMU_OPTS": qemu_options, - "SHARED_DIR": self.shared_dir, - "USE_TMPDIR": "1", - } - environment.update(dict(os.environ)) + environment = dict(os.environ) + environment.update( + { + "TMPDIR": self.state_dir, + "SHARED_DIR": self.shared_dir, + "USE_TMPDIR": "1", + "QEMU_OPTS": qemu_options, + } + ) self.process = subprocess.Popen( self.script, |