From 2a835eb8d15936af0f74ff62621e72db6f0be35e Mon Sep 17 00:00:00 2001 From: Andrew Vagin Date: Fri, 10 Jun 2016 00:09:00 +0300 Subject: [PATCH] zdtm: remove or replace noauto on crfail where it's possiable CRIU dump should fail if criu can't handle something. v2: add a separate patch to remove noauto for a few tests Signed-off-by: Andrew Vagin Signed-off-by: Pavel Emelyanov --- test/zdtm/static/overmount_dev.desc | 2 +- test/zdtm/static/overmount_fifo.desc | 2 +- test/zdtm/static/overmount_file.desc | 2 +- test/zdtm/static/overmount_sock.desc | 2 +- test/zdtm/static/socket-closed-tcp.desc | 2 +- test/zdtm/static/unhashed_proc.desc | 2 +- test/zdtm/static/unlink_largefile.desc | 2 +- test/zdtm/static/unlink_regular00.desc | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/zdtm/static/overmount_dev.desc b/test/zdtm/static/overmount_dev.desc index 95c58b401..c739fc950 100644 --- a/test/zdtm/static/overmount_dev.desc +++ b/test/zdtm/static/overmount_dev.desc @@ -1 +1 @@ -{'flags': 'noauto'} +{'flavor' : "ns", 'flags': 'suid crfail'} diff --git a/test/zdtm/static/overmount_fifo.desc b/test/zdtm/static/overmount_fifo.desc index 95c58b401..1ba68c314 100644 --- a/test/zdtm/static/overmount_fifo.desc +++ b/test/zdtm/static/overmount_fifo.desc @@ -1 +1 @@ -{'flags': 'noauto'} +{'flavor' : 'ns uns', 'flags': 'suid crfail'} diff --git a/test/zdtm/static/overmount_file.desc b/test/zdtm/static/overmount_file.desc index 95c58b401..1ba68c314 100644 --- a/test/zdtm/static/overmount_file.desc +++ b/test/zdtm/static/overmount_file.desc @@ -1 +1 @@ -{'flags': 'noauto'} +{'flavor' : 'ns uns', 'flags': 'suid crfail'} diff --git a/test/zdtm/static/overmount_sock.desc b/test/zdtm/static/overmount_sock.desc index 95c58b401..1ba68c314 100644 --- a/test/zdtm/static/overmount_sock.desc +++ b/test/zdtm/static/overmount_sock.desc @@ -1 +1 @@ -{'flags': 'noauto'} +{'flavor' : 'ns uns', 'flags': 'suid crfail'} diff --git a/test/zdtm/static/socket-closed-tcp.desc b/test/zdtm/static/socket-closed-tcp.desc index 95c58b401..ded89879a 100644 --- a/test/zdtm/static/socket-closed-tcp.desc +++ b/test/zdtm/static/socket-closed-tcp.desc @@ -1 +1 @@ -{'flags': 'noauto'} +{'flags': 'crfail'} diff --git a/test/zdtm/static/unhashed_proc.desc b/test/zdtm/static/unhashed_proc.desc index 95c58b401..847e3b27c 100644 --- a/test/zdtm/static/unhashed_proc.desc +++ b/test/zdtm/static/unhashed_proc.desc @@ -1 +1 @@ -{'flags': 'noauto'} +{'flags': 'crfail', 'opts' : '--link-remap'} diff --git a/test/zdtm/static/unlink_largefile.desc b/test/zdtm/static/unlink_largefile.desc index 95c58b401..ded89879a 100644 --- a/test/zdtm/static/unlink_largefile.desc +++ b/test/zdtm/static/unlink_largefile.desc @@ -1 +1 @@ -{'flags': 'noauto'} +{'flags': 'crfail'} diff --git a/test/zdtm/static/unlink_regular00.desc b/test/zdtm/static/unlink_regular00.desc index 53aea561b..e49bbfbc1 100644 --- a/test/zdtm/static/unlink_regular00.desc +++ b/test/zdtm/static/unlink_regular00.desc @@ -1 +1 @@ -{'flavor': 'ns', 'flags': 'suid noauto'} +{'flavor': 'ns', 'flags': 'suid crfail'}