From 5f845c928afc5c36f4c06771ce1814a16df3f5a5 Mon Sep 17 00:00:00 2001 From: Tycho Andersen Date: Fri, 5 Sep 2014 08:43:15 -0500 Subject: [PATCH] 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 Acked-by: Serge E. Hallyn --- src/tests/lxc-test-checkpoint-restore | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 -- 2.47.2