mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-01 06:45:35 +00:00
Code Issues Releases Wiki Activity

zdtm: use long form cli options

Browse Source 
Using long-form command-line options would allows us to provide
them via config file to CRIU.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
This commit is contained in:
Radostin Stoyanov
2021-08-15 10:53:29 +01:00
committed by Andrei Vagin
parent 0734fc807f
commit fc38a01e5e
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/zdtm.py
View File

@@ -560,7 +560,7 @@ class zdtm_test:
opts += ["--root", self.__flavor.root] opts += ["--root", self.__flavor.root]
if test_flag(self.__desc, 'crlib'): if test_flag(self.__desc, 'crlib'):
opts += [ opts += [
"-L", "--libdir",
os.path.dirname(os.path.realpath(self.__name)) + '/lib' os.path.dirname(os.path.realpath(self.__name)) + '/lib'
] ]
return opts return opts
@@ -899,14 +899,14 @@ class criu_rpc:
def __set_opts(criu, args, ctx): def __set_opts(criu, args, ctx):
while len(args) != 0: while len(args) != 0:
arg = args.pop(0) arg = args.pop(0)
if "-v4" == arg: if "--verbosity=4" == arg:
criu.opts.log_level = 4 criu.opts.log_level = 4
elif "-o" == arg: elif "--log-file" == arg:
criu.opts.log_file = args.pop(0) criu.opts.log_file = args.pop(0)
elif "-D" == arg: elif "--images-dir" == arg:
criu.opts.images_dir_fd = os.open(args.pop(0), os.O_DIRECTORY) criu.opts.images_dir_fd = os.open(args.pop(0), os.O_DIRECTORY)
ctx['imgd'] = criu.opts.images_dir_fd ctx['imgd'] = criu.opts.images_dir_fd
elif "-t" == arg: elif "--tree" == arg:
criu.opts.pid = int(args.pop(0)) criu.opts.pid = int(args.pop(0))
elif "--pidfile" == arg: elif "--pidfile" == arg:
ctx['pidf'] = args.pop(0) ctx['pidf'] = args.pop(0)
@@ -1118,7 +1118,8 @@ class criu:
if not log: if not log:
log = action + ".log" log = action + ".log"
s_args = ["-o", log, "-D", self.__ddir(), "-v4"] + opts s_args = ["--log-file", log, "--images-dir", self.__ddir(),
"--verbosity=4"] + opts
with open(os.path.join(self.__ddir(), action + '.cropt'), 'w') as f: with open(os.path.join(self.__ddir(), action + '.cropt'), 'w') as f:
f.write(' '.join(s_args) + '\n') f.write(' '.join(s_args) + '\n')
@@ -1316,7 +1317,7 @@ class criu:
os.mkdir(self.__ddir()) os.mkdir(self.__ddir())
os.chmod(self.__ddir(), 0o777) os.chmod(self.__ddir(), 0o777)
a_opts = ["-t", self.__test.getpid()] a_opts = ["--tree", self.__test.getpid()]
if self.__prev_dump_iter: if self.__prev_dump_iter:
a_opts += [ a_opts += [
"--prev-images-dir", "--prev-images-dir",
@@ -1461,7 +1462,8 @@ class criu:
return False return False
return criu_cli.run( return criu_cli.run(
"check", ["--no-default-config", "-v0", "--feature", feature], "check",
["--no-default-config", "--verbosity=0", "--feature", feature],
opts['criu_bin']) == 0 opts['criu_bin']) == 0
@staticmethod @staticmethod