[CRIU] [PATCH 2/5] zdtm.py: Save existing environment for zdtm-in-ct

Pavel Emelyanov xemul at parallels.com
Thu Oct 8 05:19:44 PDT 2015


Signed-off-by: Pavel Emelyanov <xemul at parallels.com>

---

diff --git a/test/zdtm.py b/test/zdtm.py
index 6eebc5f..fa5e429 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -437,7 +448,8 @@ class launcher:
 		nd = ('nocr', 'norst', 'pre', 'iters', 'page_server')
 		arg = repr((name, desc, flavor, { d: self.__opts[d] for d in nd }))
 		log = name.replace('/', '_') + ".log"
-		sub = subprocess.Popen(["zdtm_ct", "zdtm.py"], env = { 'ZDTM_CT_TEST_INFO': arg }, \
+		sub = subprocess.Popen(["./zdtm_ct", "zdtm.py"], \
+				env = dict(os.environ, ZDTM_CT_TEST_INFO = arg ), \
 				stdout = open(log, "w"), stderr = subprocess.STDOUT)
 		self.__subs[sub.pid] = { 'sub': sub, 'log': log }
 




More information about the CRIU mailing list