mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-03 07:45:17 +00:00
Code Issues Releases Wiki Activity

test/thp_disable: fix lint

Browse Source 
The fail() macro provides a new line character at the end of the
message. This patch fixes the following lint check that currently
fails in CI:

$ git --no-pager grep -E '^\s*\<(pr_perror|fail)\>.*\\n"'
test/zdtm/static/thp_disable.c:		fail("prctl(GET_THP_DISABLE) returned unexpected value: %d != 1\n", ret);
test/zdtm/static/thp_disable.c:		fail("Flags changed %lx -> %lx\n", orig_flags, new_flags);
test/zdtm/static/thp_disable.c:		fail("Madvs changed %lx -> %lx\n", orig_madv, new_madv);
test/zdtm/static/thp_disable.c:		fail("post-migration prctl(GET_THP_DISABLE) returned unexpected value: %d != 1\n", ret);
test/zdtm/static/thp_disable.c:		fail("Flags changed %lx -> %lx\n", orig_flags, new_flags);
test/zdtm/static/thp_disable.c:		fail("Madvs changed %lx -> %lx\n", orig_madv, new_madv);

Fixes: #2193

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
This commit is contained in:
Radostin Stoyanov
2023-06-18 09:53:48 +02:00
committed by Andrei Vagin
parent a2c4dd2265
commit f018893d26
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
criu/kerndat.c
View File

@@ -1325,7 +1325,7 @@ int kerndat_has_thp_disable(void)
parse_vmflags(str, &flags, &madv, &io_pf); parse_vmflags(str, &flags, &madv, &io_pf);
kdat.has_thp_disable = !(madv & (1 << MADV_NOHUGEPAGE)); kdat.has_thp_disable = !(madv & (1 << MADV_NOHUGEPAGE));
if (!kdat.has_thp_disable) if (!kdat.has_thp_disable)
pr_warn("prctl PR_SET_THP_DISABLE sets MADV_NOHUGEPAGE"); pr_warn("prctl PR_SET_THP_DISABLE sets MADV_NOHUGEPAGE\n");
break; break;
} }
} }

12
test/zdtm/static/thp_disable.c
View File

@@ -43,7 +43,7 @@ int main(int argc, char **argv)
} }
if (ret != 1) { if (ret != 1) {
errno = 0; errno = 0;
fail("prctl(GET_THP_DISABLE) returned unexpected value: %d != 1\n", ret); fail("prctl(GET_THP_DISABLE) returned unexpected value: %d != 1", ret);
return -1; return -1;
} }
@@ -53,12 +53,12 @@ int main(int argc, char **argv)
errno = 0; errno = 0;
if (orig_flags != new_flags) { if (orig_flags != new_flags) {
fail("Flags changed %lx -> %lx\n", orig_flags, new_flags); fail("Flags changed %lx -> %lx", orig_flags, new_flags);
return -1; return -1;
} }
if (orig_madv != new_madv) { if (orig_madv != new_madv) {
fail("Madvs changed %lx -> %lx\n", orig_madv, new_madv); fail("Madvs changed %lx -> %lx", orig_madv, new_madv);
return -1; return -1;
} }
@@ -72,7 +72,7 @@ int main(int argc, char **argv)
} }
if (ret != 1) { if (ret != 1) {
errno = 0; errno = 0;
fail("post-migration prctl(GET_THP_DISABLE) returned unexpected value: %d != 1\n", ret); fail("post-migration prctl(GET_THP_DISABLE) returned unexpected value: %d != 1", ret);
return -1; return -1;
} }
@@ -87,12 +87,12 @@ int main(int argc, char **argv)
errno = 0; errno = 0;
if (orig_flags != new_flags) { if (orig_flags != new_flags) {
fail("Flags changed %lx -> %lx\n", orig_flags, new_flags); fail("Flags changed %lx -> %lx", orig_flags, new_flags);
return -1; return -1;
} }
if (orig_madv != new_madv) { if (orig_madv != new_madv) {
fail("Madvs changed %lx -> %lx\n", orig_madv, new_madv); fail("Madvs changed %lx -> %lx", orig_madv, new_madv);
return -1; return -1;
} }