From: Tycho Andersen <tycho.andersen@canonical.com>
Date: Fri, 5 Sep 2014 13:43:15 +0000 (-0500)
Subject: Allow criu >= 1.3 in c/r test
X-Git-Tag: lxc-1.1.0.alpha2~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f845c928afc5c36f4c06771ce1814a16df3f5a5;p=thirdparty%2Flxc.git

Allow criu >= 1.3 in c/r test

criu version 1.3 has been tagged, which has the minimal set of patches to allow
checkpointing and restoring containers. lxc-test-checkpoint-restore is now
skipped on any version of criu lower than 1.3.

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/tests/lxc-test-checkpoint-restore b/src/tests/lxc-test-checkpoint-restore
index 43068ef44..c25d941e2 100755
--- a/src/tests/lxc-test-checkpoint-restore
+++ b/src/tests/lxc-test-checkpoint-restore
@@ -15,7 +15,13 @@ if [ "$(id -u)" != "0" ]; then
 	exit 1
 fi
 
-if [ "$(criu --version | head -n1 | cut -d' ' -f 2)" != "1.3-rc2" ]; then
+verlte() {
+	! [ "$1" = "$(printf "$1\n$2" | sort -V | tail -n1)" ]
+}
+
+criu_version="$(criu --version | head -n1 | cut -d' ' -f 2)"
+
+if verlte "$criu_version" "1.3"; then
 	echo "SKIP: skipping test because no (or wrong) criu installed."
 	exit 0
 fi