Commit 1a6de2c6 authored by Pavel Emelyanov's avatar Pavel Emelyanov

zdtm.py: Support crlib flag for tests

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: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 388df2a1
...@@ -133,7 +133,7 @@ def tail(path): ...@@ -133,7 +133,7 @@ def tail(path):
def rpidfile(path): def rpidfile(path):
return open(path).readline().strip() return open(path).readline().strip()
def wait_pid_die(pid, who, tmo = 3): def wait_pid_die(pid, who, tmo = 4):
stime = 0.1 stime = 0.1
while stime < tmo: while stime < tmo:
try: try:
...@@ -251,6 +251,8 @@ class zdtm_test: ...@@ -251,6 +251,8 @@ class zdtm_test:
opts = self.__desc.get('opts', '').split() + ["--pidfile", os.path.realpath(self.__pidfile())] opts = self.__desc.get('opts', '').split() + ["--pidfile", os.path.realpath(self.__pidfile())]
if self.__flavor.ns: if self.__flavor.ns:
opts += ["--root", self.__flavor.root] opts += ["--root", self.__flavor.root]
if test_flag(self.__desc, 'crlib'):
opts += ["-L", os.path.dirname(os.path.realpath(self.__name)) + '/lib']
return opts return opts
def gone(self, force = True): def gone(self, force = True):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment