[CRIU] [PATCH v2] zdtm: remove or replace noauto on crfail where it's possiable

[Andrey Vagin]

From: Andrew Vagin <avagin at virtuozzo.com>

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 <avagin at virtuozzo.com>
---
 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 95c58b4..c739fc9 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 95c58b4..1ba68c3 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 95c58b4..1ba68c3 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 95c58b4..1ba68c3 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 95c58b4..ded8987 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 95c58b4..847e3b2 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 95c58b4..ded8987 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 53aea56..e49bbfb 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'}
-- 
2.7.4