[CRIU] [PATCH 3/3] zdtm: don't overwrite logs if the check-only option is set

Andrei Vagin avagin at openvz.org
Wed Jun 21 08:16:47 MSK 2017


From: Andrei Vagin <avagin at virtuozzo.com>

If the check-only option is set, dump and restore is executed twice,
and we need to set separate logs for both cases.

Signed-off-by: Andrei Vagin <avagin at virtuozzo.com>
---
 test/zdtm.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index 0f7d36f..3c9ba56 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -884,7 +884,10 @@ class criu:
 
 	def __criu_act(self, action, opts = [], log = None, nowait = False):
 		if not log:
-			log = action + ".log"
+			log = action
+			if "--check-only" in opts:
+				log += ".chk"
+			log += ".log"
 
 		s_args = ["-o", log, "-D", self.__ddir(), "-v4"] + opts
 
-- 
2.9.4



More information about the CRIU mailing list