Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-01-23 02:14:37 +00:00
Code Issues Projects Releases Wiki Activity

check: Do not print "Looks good" message regardless of loglevel

Browse source 
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov 2015-01-27 16:16:01 +03:00
parent efad09285a
commit 8076c4580b
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cr-check.c
View file

@ -678,8 +678,6 @@ int cr_check(void)
struct ns_id ns = { .pid = getpid(), .nd = &mnt_ns_desc };
int ret = 0;
log_set_loglevel(LOG_WARN);
if (!is_root_user())
return -1;
@ -728,7 +726,7 @@ int cr_check(void)
out:
if (!ret)
pr_msg("Looks good.\n");
print_on_level(DEFAULT_LOGLEVEL, "Looks good.\n");
return ret;
}

12
test/zdtm.sh
View file

@ -224,24 +224,24 @@ generate_test_list()
ns/static/tun
"
$CRIU check --feature "mnt_id"
$CRIU check -v0 --feature "mnt_id"
if [ $? -eq 0 ]; then
TEST_LIST="$TEST_LIST$TEST_MNTNS"
else
export ZDTM_NOSUBNS=1
fi
$CRIU check --feature "aio_remap"
$CRIU check -v0 --feature "aio_remap"
if [ $? -eq 0 ]; then
TEST_LIST="$TEST_LIST$TEST_AIO"
fi
$CRIU check --feature "timerfd"
$CRIU check -v0 --feature "timerfd"
if [ $? -eq 0 ]; then
TEST_LIST="$TEST_LIST$TEST_TIMERFD"
fi
$CRIU check --feature "tun"
$CRIU check -v0 --feature "tun"
if [ $? -eq 0 ]; then
TEST_LIST="$TEST_LIST$TEST_TUN"
fi
@ -296,7 +296,7 @@ generate_test_list()
"
# Add tests which can be executed in an user namespace
$CRIU check --feature "userns"
$CRIU check -v0 --feature "userns"
if [ $? -eq 0 ]; then
blist=`mktemp /tmp/zdtm.black.XXXXXX`
echo "$BLACKLIST_FOR_USERNS" | tr -d "[:blank:]" | sort > $blist
@ -399,7 +399,7 @@ check_mainstream()
{
zdtm_sep "CRIU CHECK"
$CRIU check && return 0
$CRIU check -v1 && return 0
MAINSTREAM_KERNEL=1
cat >&2 <<EOF