Skip to content

Commit 994dc26

Browse files
committed
selftests/coredump: fix build
Fix various warnings in the selftest build. Link: https://lore.kernel.org/20250603-work-coredump-socket-protocol-v2-2-05a5f0c18ecc@kernel.org Acked-by: Lennart Poettering <lennart@poettering.net> Reviewed-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com> Reviewed-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Christian Brauner <brauner@kernel.org>
1 parent 12b5b13 commit 994dc26

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

tools/testing/selftests/coredump/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: GPL-2.0-only
2-
CFLAGS = $(KHDR_INCLUDES)
2+
CFLAGS = -Wall -O0 $(KHDR_INCLUDES)
33

44
TEST_GEN_PROGS := stackdump_test
55
TEST_FILES := stackdump

tools/testing/selftests/coredump/stackdump_test.c

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ static void *do_nothing(void *)
2424
{
2525
while (1)
2626
pause();
27+
28+
return NULL;
2729
}
2830

2931
static void crashing_child(void)
@@ -46,9 +48,7 @@ FIXTURE(coredump)
4648

4749
FIXTURE_SETUP(coredump)
4850
{
49-
char buf[PATH_MAX];
5051
FILE *file;
51-
char *dir;
5252
int ret;
5353

5454
self->pid_coredump_server = -ESRCH;
@@ -106,7 +106,6 @@ FIXTURE_TEARDOWN(coredump)
106106

107107
TEST_F_TIMEOUT(coredump, stackdump, 120)
108108
{
109-
struct sigaction action = {};
110109
unsigned long long stack;
111110
char *test_dir, *line;
112111
size_t line_length;
@@ -171,11 +170,10 @@ TEST_F_TIMEOUT(coredump, stackdump, 120)
171170

172171
TEST_F(coredump, socket)
173172
{
174-
int fd, pidfd, ret, status;
173+
int pidfd, ret, status;
175174
FILE *file;
176175
pid_t pid, pid_coredump_server;
177176
struct stat st;
178-
char core_file[PATH_MAX];
179177
struct pidfd_info info = {};
180178
int ipc_sockets[2];
181179
char c;
@@ -356,11 +354,10 @@ TEST_F(coredump, socket)
356354

357355
TEST_F(coredump, socket_detect_userspace_client)
358356
{
359-
int fd, pidfd, ret, status;
357+
int pidfd, ret, status;
360358
FILE *file;
361359
pid_t pid, pid_coredump_server;
362360
struct stat st;
363-
char core_file[PATH_MAX];
364361
struct pidfd_info info = {};
365362
int ipc_sockets[2];
366363
char c;
@@ -384,7 +381,7 @@ TEST_F(coredump, socket_detect_userspace_client)
384381
pid_coredump_server = fork();
385382
ASSERT_GE(pid_coredump_server, 0);
386383
if (pid_coredump_server == 0) {
387-
int fd_server, fd_coredump, fd_peer_pidfd, fd_core_file;
384+
int fd_server, fd_coredump, fd_peer_pidfd;
388385
socklen_t fd_peer_pidfd_len;
389386

390387
close(ipc_sockets[0]);
@@ -464,7 +461,6 @@ TEST_F(coredump, socket_detect_userspace_client)
464461
close(fd_coredump);
465462
close(fd_server);
466463
close(fd_peer_pidfd);
467-
close(fd_core_file);
468464
_exit(EXIT_SUCCESS);
469465
}
470466
self->pid_coredump_server = pid_coredump_server;
@@ -488,7 +484,6 @@ TEST_F(coredump, socket_detect_userspace_client)
488484
if (ret < 0)
489485
_exit(EXIT_FAILURE);
490486

491-
(void *)write(fd_socket, &(char){ 0 }, 1);
492487
close(fd_socket);
493488
_exit(EXIT_SUCCESS);
494489
}
@@ -519,7 +514,6 @@ TEST_F(coredump, socket_enoent)
519514
int pidfd, ret, status;
520515
FILE *file;
521516
pid_t pid;
522-
char core_file[PATH_MAX];
523517

524518
file = fopen("/proc/sys/kernel/core_pattern", "w");
525519
ASSERT_NE(file, NULL);
@@ -569,7 +563,6 @@ TEST_F(coredump, socket_no_listener)
569563
ASSERT_GE(pid_coredump_server, 0);
570564
if (pid_coredump_server == 0) {
571565
int fd_server;
572-
socklen_t fd_peer_pidfd_len;
573566

574567
close(ipc_sockets[0]);
575568

0 commit comments

Comments
 (0)