From 9192b052b20bf41792d85bd63b4d8b4742e260aa Mon Sep 17 00:00:00 2001 From: Zhang Wei Date: Wed, 28 Dec 2016 15:28:19 +0800 Subject: [PATCH] Fix integration when missing criu If criu isn't installed in the host, integration tests won't be able to go on, it should skip checkpoint/restore tests instead of interrupt. Output before: ``` $ make localintegration bats -t tests/integration /usr/lib/bats/bats-exec-suite: line 20: let: count+=: syntax error: operand expected (error token is "+=") Makefile:103: recipe for target 'localintegration' failed ``` Signed-off-by: Zhang Wei --- tests/integration/helpers.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/helpers.bash b/tests/integration/helpers.bash index 2a369ba4..29e0fef6 100644 --- a/tests/integration/helpers.bash +++ b/tests/integration/helpers.bash @@ -18,7 +18,7 @@ HELLO_IMAGE="$TESTDATA/hello-world.tar" HELLO_BUNDLE="$BATS_TMPDIR/hello-world" # CRIU PATH -CRIU="$(which criu)" +CRIU="$(which criu || true)" # Kernel version KERNEL_VERSION="$(uname -r)"