[CRIU] [PATCH 4/4] zdtm.py: Support crlib flag for tests

Pavel Emelyanov xemul at parallels.com
Thu Oct 8 13:09:32 PDT 2015


This flag means that there's lib/ directory where a plugin is.
Currently rtc test is such. The wait_pid_die timeout is risen
since this test dies for more than 6 seconds :)

Signed-off-by: Pavel Emelyanov <xemul at parallels.com>
---
 test/zdtm.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index 7b2e077..cc2bf6c 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -133,7 +133,7 @@ def tail(path):
 def rpidfile(path):
 	return open(path).readline().strip()
 
-def wait_pid_die(pid, who, tmo = 3):
+def wait_pid_die(pid, who, tmo = 4):
 	stime = 0.1
 	while stime < tmo:
 		try:
@@ -251,6 +251,8 @@ class zdtm_test:
 		opts = self.__desc.get('opts', '').split() + ["--pidfile", os.path.realpath(self.__pidfile())]
 		if self.__flavor.ns:
 			opts += ["--root", self.__flavor.root]
+		if test_flag(self.__desc, 'crlib'):
+			opts += ["-L", os.path.dirname(os.path.realpath(self.__name)) + '/lib']
 		return opts
 
 	def gone(self, force = True):
-- 
1.9.3



More information about the CRIU mailing list