Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
criu
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhul
criu
Commits
8076c458
Commit
8076c458
authored
Jan 27, 2015
by
Pavel Emelyanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
check: Do not print "Looks good" message regardless of loglevel
Signed-off-by:
Pavel Emelyanov
<
xemul@parallels.com
>
parent
efad0928
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
9 deletions
+7
-9
cr-check.c
cr-check.c
+1
-3
zdtm.sh
test/zdtm.sh
+6
-6
No files found.
cr-check.c
View file @
8076c458
...
...
@@ -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
"
);
pr
int_on_level
(
DEFAULT_LOGLEVEL
,
"Looks good.
\n
"
);
return
ret
;
}
...
...
test/zdtm.sh
View file @
8076c458
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment