58 lines
1.7 KiB
Diff
58 lines
1.7 KiB
Diff
|
From c3c6d81418c4dc23ac81dc2a6f5751a8c82667a3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||
|
|
Date: Sat, 19 Oct 2019 19:11:22 +0100
|
||
|
|
Subject: [PATCH 3/3] tests/test-socket-activation.c: Don't check nbdkit exit
|
||
|
|
status.
|
||
|
|
|
||
|
|
In this test we run nbdkit as a subprocess of the test. The test
|
||
|
|
checked the exit status of nbdkit. However nbdkit can segfault on
|
||
|
|
shutdown because we are setting MALLOC_PERTURB_.
|
||
|
|
|
||
|
|
We need to fix nbdkit's shutdown path eventually, but for this test it
|
||
|
|
is not relevant so ignore the exit status.
|
||
|
|
|
||
|
|
This makes the test more stable.
|
||
|
|
---
|
||
|
|
tests/test-socket-activation.c | 23 +----------------------
|
||
|
|
1 file changed, 1 insertion(+), 22 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/tests/test-socket-activation.c b/tests/test-socket-activation.c
|
||
|
|
index 2141d6d..64ec327 100644
|
||
|
|
--- a/tests/test-socket-activation.c
|
||
|
|
+++ b/tests/test-socket-activation.c
|
||
|
|
@@ -88,30 +88,9 @@ cleanup (void)
|
||
|
|
{
|
||
|
|
int status;
|
||
|
|
|
||
|
|
- if (pid > 0) {
|
||
|
|
+ if (pid > 0)
|
||
|
|
kill (pid, SIGTERM);
|
||
|
|
|
||
|
|
- /* Check the status of nbdkit is normal on exit. */
|
||
|
|
- if (waitpid (pid, &status, 0) == -1) {
|
||
|
|
- perror ("waitpid");
|
||
|
|
- _exit (EXIT_FAILURE);
|
||
|
|
- }
|
||
|
|
- if (WIFEXITED (status) && WEXITSTATUS (status) != 0) {
|
||
|
|
- _exit (WEXITSTATUS (status));
|
||
|
|
- }
|
||
|
|
- if (WIFSIGNALED (status)) {
|
||
|
|
- /* Note that nbdkit is supposed to catch the signal we send and
|
||
|
|
- * exit cleanly, so the following shouldn't happen.
|
||
|
|
- */
|
||
|
|
- fprintf (stderr, "nbdkit terminated by signal %d\n", WTERMSIG (status));
|
||
|
|
- _exit (EXIT_FAILURE);
|
||
|
|
- }
|
||
|
|
- if (WIFSTOPPED (status)) {
|
||
|
|
- fprintf (stderr, "nbdkit stopped by signal %d\n", WSTOPSIG (status));
|
||
|
|
- _exit (EXIT_FAILURE);
|
||
|
|
- }
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
unlink (pidpath);
|
||
|
|
unlink (sockpath);
|
||
|
|
rmdir (tmpdir);
|
||
|
|
--
|
||
|
|
2.23.0
|
||
|
|
|