[CRIU] [PATCH] zdtm: check "criu dedup"

[Andrew Vagin]

Pls, ignore this patch
On Fri, Sep 02, 2016 at 12:01:30AM +0300, Andrei Vagin wrote:
> From: Andrew Vagin <avagin at virtuozzo.com>
> 
> Add a new option to zdtm.py to run "criu dedup" after "criu dump"
> or "criu pre-dump".
> 
> Signed-off-by: Andrei Vagin <avagin at virtuozzo.com>
> ---
>  test/jenkins/criu-dedup.sh | 2 ++
>  test/zdtm.py               | 7 ++++++-
>  2 files changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/test/jenkins/criu-dedup.sh b/test/jenkins/criu-dedup.sh
> index a6dc7dc..e75ef5f 100755
> --- a/test/jenkins/criu-dedup.sh
> +++ b/test/jenkins/criu-dedup.sh
> @@ -10,3 +10,5 @@ prep
>  ./test/zdtm.py run -t zdtm/transition/maps007 --keep-going --report report -f h --pre 8:.1 --dedup || fail
>  ./test/zdtm.py run -t zdtm/static/mem-touch   --keep-going --report report -f h --pre 8:.1 --dedup || fail
>  ./test/zdtm.py run -t zdtm/transition/maps008 --keep-going --report report -f h --pre 8:.1 --dedup || fail
> +./test/zdtm.py run -t zdtm/transition/maps007 --keep-going --report report -f h --pre 8:.1 --noauto-dedup || fail
> +./test/zdtm.py run -t zdtm/static/mem-touch   --keep-going --report report -f h --pre 8:.1 --noauto-dedup || fail
> diff --git a/test/zdtm.py b/test/zdtm.py
> index abcd5ed..5798a89 100755
> --- a/test/zdtm.py
> +++ b/test/zdtm.py
> @@ -679,6 +679,7 @@ class criu_cli:
>  		self.__script = opts['script']
>  		self.__sat = (opts['sat'] and True or False)
>  		self.__dedup = (opts['dedup'] and True or False)
> +		self.__mdedup = (opts['noauto_dedup'] and True or False)
>  		self.__user = (opts['user'] and True or False)
>  		self.__leave_stopped = (opts['stop'] and True or False)
>  
> @@ -814,6 +815,8 @@ class criu_cli:
>  			a_opts += ['--leave-stopped']
>  
>  		self.__criu_act(action, opts = a_opts + opts)
> +		if self.__mdedup and self.__iter > 1:
> +			self.__criu_act("dedup", opts = [])
>  
>  		if self.__leave_stopped:
>  			pstree_check_stopped(self.__test.getpid())
> @@ -1281,7 +1284,8 @@ class launcher:
>  
>  		nd = ('nocr', 'norst', 'pre', 'iters', 'page_server', 'sibling', 'unshare',
>  				'fault', 'keep_img', 'report', 'snaps', 'sat', 'script', 'stop',
> -				'join_ns', 'dedup', 'sbs', 'freezecg', 'user', 'dry_run', 'lazy_pages')
> +				'join_ns', 'dedup', 'sbs', 'freezecg', 'user', 'dry_run',
> +				'lazy_pages', 'noauto_dedup')
>  		arg = repr((name, desc, flavor, {d: self.__opts[d] for d in nd}))
>  
>  		if self.__use_log:
> @@ -1721,6 +1725,7 @@ rp.add_argument("--join-ns", help = "Restore tests and join existing namespace",
>  rp.add_argument("--pre", help = "Do some pre-dumps before dump (n[:pause])")
>  rp.add_argument("--snaps", help = "Instead of pre-dumps do full dumps", action = 'store_true')
>  rp.add_argument("--dedup", help = "Auto-deduplicate images on iterations", action = 'store_true')
> +rp.add_argument("--noauto-dedup", help = "Manual deduplicate images on iterations", action = 'store_true')
>  rp.add_argument("--nocr", help = "Do not CR anything, just check test works", action = 'store_true')
>  rp.add_argument("--norst", help = "Don't restore tasks, leave them running after dump", action = 'store_true')
>  rp.add_argument("--stop", help = "Check that --leave-stopped option stops ps tree.", action = 'store_true')
> -- 
> 2.7.4
>