From 459fb8b7da4f7e98d978701d500038407d4847fc Mon Sep 17 00:00:00 2001
From: Andrew Vagin <avagin@openvz.org>
Date: Wed, 16 Sep 2015 18:41:00 +0300
Subject: [PATCH] zdtm: don't run file_locks* tests simultaneously

/proc/locks can contains the same locks twice, if someone
releases a lock when we are reading this file.

Signed-off-by: Andrew Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
---
 test/zdtm.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/zdtm.sh b/test/zdtm.sh
index 9bbeb2a48..a7340037d 100755
--- a/test/zdtm.sh
+++ b/test/zdtm.sh
@@ -1174,7 +1174,11 @@ if [ $SPECIFIED_NAME_USED -eq 1 ]; then
 		exit 1
 	fi
 	$CRIU check -v0 --feature "mnt_id" || export ZDTM_NOSUBNS=1
-	run_test $1 || case_error $1
+	# don't run file_locks* tests simultaneously
+	(
+		expr $1 : ".*file_locks" > /dev/null && flock 10
+		run_test $1 10<&-
+	) 10<zdtm.sh || case_error $1
 else
 	if [ $# -eq 0 ]; then
 		pattern='.*'