[CRIU] [PATCH 01/21] zdtm: Make possible to claim for features list

Kirill Tkhai ktkhai at virtuozzo.com
Tue May 23 05:38:11 PDT 2017


Currently, one feature is supported. Add possibility
for a test to depend on several features.

Signed-off-by: Kirill Tkhai <ktkhai at virtuozzo.com>
---
 test/zdtm.py |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index 26b8939ae..761843d24 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -1714,12 +1714,16 @@ default_test = {}
 
 			feat = tdesc.get('feature', None)
 			if feat:
-				if feat not in features:
-					print "Checking feature %s" % feat
-					features[feat] = criu.check(feat)
-
-				if not features[feat]:
-					l.skip(t, "no %s feature" % feat)
+				for f in feat.split():
+					if f not in features:
+						print "Checking feature %s" % f
+						features[f] = criu.check(f)
+
+					if not features[f]:
+						l.skip(t, "no %s feature" % f)
+						feat = None
+						break
+				if feat is None:
 					continue
 
 			if self_checkskip(t):



More information about the CRIU mailing list