[CRIU] [PATCH 2/2] travis-tests: set CRIU_PMC_OFF conditionally

Kir Kolyshkin kir at openvz.org
Wed May 17 12:32:41 PDT 2017


We only needed it for kernel 3.19. Apparently, Ubuntu 14.04.5 comes
with a kernel from 16.04 (i.e. 4.4), so we can disable this workaround!

Anyway, just in case, let's do it conditionally.

While at it, slightly improve the comment.

Signed-off-by: Kir Kolyshkin <kir at openvz.org>
---
 scripts/travis/travis-tests | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/travis/travis-tests b/scripts/travis/travis-tests
index 7ec514b..cc61f8a 100755
--- a/scripts/travis/travis-tests
+++ b/scripts/travis/travis-tests
@@ -53,10 +53,11 @@ time make CC="$CC" -j4 -C test/zdtm
 
 umask 0000
 export SKIP_PREP=1
-# The 3.19 Ubuntu kernel has a bug. When pagemap are read for a few vma-s
-# for one read call, it returns incorrect data.
-# https://github.com/xemul/criu/issues/207
-export CRIU_PMC_OFF=1
+# The 3.19 kernel (from Ubuntu 14.04) has a bug. When /proc/PID/pagemap
+# is read for a few VMAs in one read call, incorrect data is returned.
+# See https://github.com/xemul/criu/issues/207
+# Kernel 4.4 (from Ubuntu 14.04.5 update) fixes this.
+uname -r | grep -q ^3\.19 && export CRIU_PMC_OFF=1
 
 chmod 0777 test/
 chmod 0777 test/zdtm/static
-- 
2.9.3



More information about the CRIU mailing list