tests: add a safeguard to terminate()

Add a safeguard to `terminate()` so that we don't kill whole pgroups.

Signed-off-by: Alexander Sosedkin <asosedkin@redhat.com>

diff --git a/tests/alerts.c b/tests/alerts.c
index 4768f639b9fd98acb7492a8a8d293b067a197b3b..6bc2868addaf0fc60a149cacc279e0ee27da14c4 100644 (file)
--- a/tests/alerts.c
+++ b/tests/alerts.c
@@ -149,6 +149,7 @@ pid_t child;
 
 static void terminate(void)
 {
+       assert(child);
        kill(child, SIGTERM);
        exit(1);
 }

diff --git a/tests/alpn-server-prec.c b/tests/alpn-server-prec.c
index 0461c5d39a0d698ac2e175b2b6aea3d0a9acdbda..115522c843b1bea78768e08861197415ca63b4af 100644 (file)
--- a/tests/alpn-server-prec.c
+++ b/tests/alpn-server-prec.c
@@ -160,7 +160,7 @@ static void client(int fd, const char *protocol0, const char *protocol1, const c
 static void terminate(void)
 {
        int status;
-
+       assert(child);
        kill(child, SIGTERM);
        wait(&status);
        exit(1);

diff --git a/tests/client-fastopen.c b/tests/client-fastopen.c
index 5a1457a8e869a6672ba190d467f7e2f91c481d01..cf527ffedad24363acced2c4282bf2fa3a98afc5 100644 (file)
--- a/tests/client-fastopen.c
+++ b/tests/client-fastopen.c
@@ -154,6 +154,7 @@ pid_t child;
 
 static void terminate(void)
 {
+       assert(child);
        kill(child, SIGTERM);
        exit(1);
 }

diff --git a/tests/custom-urls-override.c b/tests/custom-urls-override.c
index 8ce3606cf98d92e29b3f1fe1514759eadd68d1ff..1ed55b2fdea8a300efdb0c1c3ae94849f0212b41 100644 (file)
--- a/tests/custom-urls-override.c
+++ b/tests/custom-urls-override.c
@@ -140,6 +140,7 @@ pid_t child;
 
 static void terminate(void)
 {
+       assert(child);
        kill(child, SIGTERM);
        exit(1);
 }

diff --git a/tests/custom-urls.c b/tests/custom-urls.c
index a7295a174c371780f291654835221640771f54af..81bf8353f96d0a8c686c1480b6ec3e284ea3b122 100644 (file)
--- a/tests/custom-urls.c
+++ b/tests/custom-urls.c
@@ -137,6 +137,7 @@ pid_t child;
 
 static void terminate(void)
 {
+       assert(child);
        kill(child, SIGTERM);
        exit(1);
 }

diff --git a/tests/dtls-client-with-seccomp.c b/tests/dtls-client-with-seccomp.c
index 7fc77263b42d4f16d0bfc36c9880d39451618220..c39068c18be8cc74266d35d1f1ebfd25de766d9e 100644 (file)
--- a/tests/dtls-client-with-seccomp.c
+++ b/tests/dtls-client-with-seccomp.c
@@ -169,7 +169,7 @@ pid_t child;
 static void terminate(void)
 {
        int status;
-
+       assert(child);
        kill(child, SIGTERM);
        wait(&status);
        exit(1);

diff --git a/tests/dtls-etm.c b/tests/dtls-etm.c
index 765bc1fb192bfba9a58ef787b60b6f46db66297b..1a8c1b55aab61fd1717d87d3f253583643f42691 100644 (file)
--- a/tests/dtls-etm.c
+++ b/tests/dtls-etm.c
@@ -180,6 +180,7 @@ pid_t child;
 
 static void terminate(void)
 {
+       assert(child);
        kill(child, SIGTERM);
        exit(1);
 }

diff --git a/tests/dtls-rehandshake-anon.c b/tests/dtls-rehandshake-anon.c
index 12f432387a8048675dc207f788252a6f1489441c..f281f5d3fa70b8ad56516579f7b146fbeb374101 100644 (file)
--- a/tests/dtls-rehandshake-anon.c
+++ b/tests/dtls-rehandshake-anon.c
@@ -200,7 +200,7 @@ pid_t child;
 static void terminate(void)
 {
        int status;
-
+       assert(child);
        kill(child, SIGTERM);
        wait(&status);
        exit(1);

diff --git a/tests/dtls-rehandshake-cert-2.c b/tests/dtls-rehandshake-cert-2.c
index 2400ab85eeb8d94ad7e84c503e447daf63274d50..c9d50585a8749cd200d723b868d2fab0b7058e8e 100644 (file)
--- a/tests/dtls-rehandshake-cert-2.c
+++ b/tests/dtls-rehandshake-cert-2.c
@@ -205,7 +205,7 @@ pid_t child;
 static void terminate(void)
 {
        int status;
-
+       assert(child);
        kill(child, SIGTERM);
        wait(&status);
        exit(1);

diff --git a/tests/dtls-rehandshake-cert-3.c b/tests/dtls-rehandshake-cert-3.c
index b537a2b6702dfc26e5bbdc3c6c313c730f7a0981..855f63cee67d475b3d11255fc4b65d83a85627a6 100644 (file)
--- a/tests/dtls-rehandshake-cert-3.c
+++ b/tests/dtls-rehandshake-cert-3.c
@@ -212,7 +212,7 @@ pid_t child;
 static void terminate(void)
 {
        int status;
-
+       assert(child);
        kill(child, SIGTERM);
        wait(&status);
        exit(1);

diff --git a/tests/dtls-rehandshake-cert.c b/tests/dtls-rehandshake-cert.c
index a9535a3ab65842da6303a00c5db80bac0c55fadb..3439ee9e934539a860c8b35522c429b17aed7ac6 100644 (file)
--- a/tests/dtls-rehandshake-cert.c
+++ b/tests/dtls-rehandshake-cert.c
@@ -201,7 +201,7 @@ pid_t child;
 static void terminate(void)
 {
        int status;
-
+       assert(child);
        kill(child, SIGTERM);
        wait(&status);
        exit(1);

diff --git a/tests/dtls-with-seccomp.c b/tests/dtls-with-seccomp.c
index fa46c3dfc9757c54cd5a585b63b53a688e993183..357c3336c41fb245e888d24bf6e9a4f8a182a420 100644 (file)
--- a/tests/dtls-with-seccomp.c
+++ b/tests/dtls-with-seccomp.c
@@ -160,7 +160,7 @@ pid_t child;
 static void terminate(void)
 {
        int status;
-
+       assert(child);
        kill(child, SIGTERM);
        wait(&status);
        exit(1);

diff --git a/tests/fallback-scsv.c b/tests/fallback-scsv.c
index aeaa9d8056158020c24e9a029ee9ccbb7a6b3838..d823e625a733606d65813f026e5a65d062db7440 100644 (file)
--- a/tests/fallback-scsv.c
+++ b/tests/fallback-scsv.c
@@ -161,6 +161,7 @@ pid_t child;
 
 static void terminate(void)
 {
+       assert(child);
        kill(child, SIGTERM);
        exit(1);
 }

diff --git a/tests/key-material-dtls.c b/tests/key-material-dtls.c
index 32a37c1b0a13881466000a981f68793ae4133647..e54500d7bf1df8b51603f916aef9c7ff000284c2 100644 (file)
--- a/tests/key-material-dtls.c
+++ b/tests/key-material-dtls.c
@@ -83,8 +83,10 @@ static void terminate(void)
 {
        int status = 0;
 
-       kill(child, SIGTERM);
-       wait(&status);
+       if (child) {
+               kill(child, SIGTERM);
+               wait(&status);
+       }
        exit(1);
 }
 

diff --git a/tests/key-material-set-dtls.c b/tests/key-material-set-dtls.c
index bd119cd1ef9f51cadefbac722cfc689271d92d8d..6e6d6d2df51d6e86bfea039f1640f4984a91927b 100644 (file)
--- a/tests/key-material-set-dtls.c
+++ b/tests/key-material-set-dtls.c
@@ -71,8 +71,10 @@ static void terminate(void)
 {
        int status = 0;
 
-       kill(child, SIGTERM);
-       wait(&status);
+       if (child) {
+               kill(child, SIGTERM);
+               wait(&status);
+       }
        exit(1);
 }
 

diff --git a/tests/keylog-func.c b/tests/keylog-func.c
index 4350698e6b71058390f54f9e99c3f7e15d32727d..8145c55d1dcb08eff7d78a14d14fa9fdee961129 100644 (file)
--- a/tests/keylog-func.c
+++ b/tests/keylog-func.c
@@ -303,8 +303,10 @@ static void terminate(void)
 {
        int status = 0;
 
-       kill(child, SIGTERM);
-       wait(&status);
+       if (child) {
+               kill(child, SIGTERM);
+               wait(&status);
+       }
        exit(1);
 }
 

diff --git a/tests/mini-alpn.c b/tests/mini-alpn.c
index bed981451a7619b71104378893da0d9db112d0f3..a8c9eb50af56893b91a8738976282fa34f36274e 100644 (file)
--- a/tests/mini-alpn.c
+++ b/tests/mini-alpn.c
@@ -162,7 +162,7 @@ static void client(int fd, const char *protocol0, const char *protocol2, const c
 static void terminate(void)
 {
        int status;
-
+       assert(child);
        kill(child, SIGTERM);
        wait(&status);
        exit(1);

diff --git a/tests/mini-dtls-discard.c b/tests/mini-dtls-discard.c
index 2ad841b1d86f0d8def6d9e89431b32fe6fbf2d03..7b0d23ed5a90ac18789d59412743be1d9519dd69 100644 (file)
--- a/tests/mini-dtls-discard.c
+++ b/tests/mini-dtls-discard.c
@@ -169,7 +169,7 @@ pid_t child;
 static void terminate(void)
 {
        int status;
-
+       assert(child);
        kill(child, SIGTERM);
        wait(&status);
        exit(1);

diff --git a/tests/mini-dtls-fork.c b/tests/mini-dtls-fork.c
index b3164ef65cdf4a826f61142ce7733d05c61fc801..f7b0ee7f603fe4f6b9904ef0af8bcb8be434aae3 100644 (file)
--- a/tests/mini-dtls-fork.c
+++ b/tests/mini-dtls-fork.c
@@ -56,7 +56,7 @@ pid_t child;
 static void terminate(void)
 {
        int status;
-
+       assert(child);
        kill(child, SIGTERM);
        wait(&status);
        exit(1);

diff --git a/tests/mini-dtls-heartbeat.c b/tests/mini-dtls-heartbeat.c
index c96ee626197cf5fd48fd84d36815757ff0e3350f..c5ca28b1a7bbe780ce6c64f6bd6f62d25ec4fc41 100644 (file)
--- a/tests/mini-dtls-heartbeat.c
+++ b/tests/mini-dtls-heartbeat.c
@@ -205,7 +205,7 @@ static gnutls_session_t initialize_tls_session(void)
 static void terminate(void)
 {
        int status;
-
+       assert(child);
        kill(child, SIGTERM);
        wait(&status);
        exit(1);

diff --git a/tests/mini-dtls-hello-verify.c b/tests/mini-dtls-hello-verify.c
index 1029c868772fca5a875c79ac4a8eee6de2de4d9a..801931398766b4ccc1ecd4513e5ba64e731ed9b0 100644 (file)
--- a/tests/mini-dtls-hello-verify.c
+++ b/tests/mini-dtls-hello-verify.c
@@ -167,7 +167,7 @@ pid_t child;
 static void terminate(void)
 {
        int status;
-
+       assert(child);
        kill(child, SIGTERM);
        wait(&status);
        exit(1);

diff --git a/tests/mini-dtls-lowmtu.c b/tests/mini-dtls-lowmtu.c
index a04d6227ef7c4189b4a28874c5424875400951de..6f8da5c597f610499bda1bd842ad12d5729ec08f 100644 (file)
--- a/tests/mini-dtls-lowmtu.c
+++ b/tests/mini-dtls-lowmtu.c
@@ -199,6 +199,7 @@ pid_t child;
 
 static void terminate(void)
 {
+       assert(child);
        kill(child, SIGTERM);
        exit(1);
 }

diff --git a/tests/mini-dtls-mtu.c b/tests/mini-dtls-mtu.c
index fa79cd64479dcbf84cd98347d1694f5d43c9f8da..d48c328a07638dfdc451eec1a16e7fbc7aed6b11 100644 (file)
--- a/tests/mini-dtls-mtu.c
+++ b/tests/mini-dtls-mtu.c
@@ -201,7 +201,7 @@ pid_t child;
 static void terminate(void)
 {
        int status;
-
+       assert(child);
        kill(child, SIGTERM);
        wait(&status);
        exit(1);

diff --git a/tests/mini-dtls-record-asym.c b/tests/mini-dtls-record-asym.c
index 234e51b109a94ac10bce3232b932cf32fcc90f33..59e7467b139368c2774a99cc9b5b5be884425178 100644 (file)
--- a/tests/mini-dtls-record-asym.c
+++ b/tests/mini-dtls-record-asym.c
@@ -239,7 +239,7 @@ pid_t child;
 static void terminate(void)
 {
        int status;
-
+       assert(child);
        kill(child, SIGTERM);
        wait(&status);
        exit(1);

diff --git a/tests/mini-dtls-record.c b/tests/mini-dtls-record.c
index 451ccbfdb8c83c997e69d46cbe50ca02f577732d..bcda720391dd7699b9a27c010f5f69c9a58a8108 100644 (file)
--- a/tests/mini-dtls-record.c
+++ b/tests/mini-dtls-record.c
@@ -275,7 +275,7 @@ static void client(int fd)
 static void terminate(void)
 {
        int status;
-
+       assert(child);
        kill(child, SIGTERM);
        wait(&status);
        exit(1);

diff --git a/tests/mini-dtls-srtp.c b/tests/mini-dtls-srtp.c
index 78c03b3d1e1cd2453f9e3c1294f6116760b59ce1..1d40d734c1d6186c652196535e1b130a5aca9f90 100644 (file)
--- a/tests/mini-dtls-srtp.c
+++ b/tests/mini-dtls-srtp.c
@@ -184,7 +184,7 @@ static void client(int fd, int profile)
 static void terminate(void)
 {
        int status;
-
+       assert(child);
        kill(child, SIGTERM);
        wait(&status);
        exit(1);

diff --git a/tests/mini-dtls0-9.c b/tests/mini-dtls0-9.c
index 496df46aab90f2b9b380bdb3380e83b068cb3cc9..1877f7c4855182f3e9781baca9f4962afe75ef59 100644 (file)
--- a/tests/mini-dtls0-9.c
+++ b/tests/mini-dtls0-9.c
@@ -178,7 +178,7 @@ pid_t child;
 static void terminate(void)
 {
        int status;
-
+       assert(child);
        kill(child, SIGTERM);
        wait(&status);
        exit(1);

diff --git a/tests/mini-key-material.c b/tests/mini-key-material.c
index 15f74c424776cb47d505d1ae19ba2df0d2e70937..39493d92f4967144e8318b6497a8f18c57127a3c 100644 (file)
--- a/tests/mini-key-material.c
+++ b/tests/mini-key-material.c
@@ -82,8 +82,10 @@ static void terminate(void)
 {
        int status = 0;
 
-       kill(child, SIGTERM);
-       wait(&status);
+       if (child) {
+               kill(child, SIGTERM);
+               wait(&status);
+       }
        exit(1);
 }
 

diff --git a/tests/mini-overhead.c b/tests/mini-overhead.c
index 6cd230d2df2fbcc079e3c35c07ae7bb64cc464d0..4496491884df2ad724f166ebc49133e5b9251fbd 100644 (file)
--- a/tests/mini-overhead.c
+++ b/tests/mini-overhead.c
@@ -214,6 +214,7 @@ static gnutls_session_t initialize_tls_session(const char *prio)
 
 static void terminate(void)
 {
+       assert(child);
        kill(child, SIGTERM);
        exit(1);
 }

diff --git a/tests/mini-record-2.c b/tests/mini-record-2.c
index c5436cf9845923d881cde780a46b5141d2811c83..6a73ad98d8dd076b051ac869316b82d2edeb743a 100644 (file)
--- a/tests/mini-record-2.c
+++ b/tests/mini-record-2.c
@@ -248,6 +248,7 @@ pid_t child;
 
 static void terminate(void)
 {
+       assert(child);
        kill(child, SIGTERM);
        exit(1);
 }

diff --git a/tests/mini-record-failure.c b/tests/mini-record-failure.c
index a778f36c535b057009446f3809ddfa84cb7f8f9a..5eb2eff216aa42fd05ddd1c5de2abfe70aecd7f3 100644 (file)
--- a/tests/mini-record-failure.c
+++ b/tests/mini-record-failure.c
@@ -179,6 +179,7 @@ pid_t child;
 
 static void terminate(void)
 {
+       assert(child);
        kill(child, SIGTERM);
        exit(1);
 }

diff --git a/tests/mini-record-range.c b/tests/mini-record-range.c
index f0f0b25723f29cc793f4f8812c74416e0211ceaf..4c4242a6eaec0b646d78a7cb2e3e00b958309eee 100644 (file)
--- a/tests/mini-record-range.c
+++ b/tests/mini-record-range.c
@@ -177,6 +177,7 @@ pid_t child;
 
 static void terminate(void)
 {
+       assert(child);
        kill(child, SIGTERM);
        exit(1);
 }

diff --git a/tests/mini-record.c b/tests/mini-record.c
index 8a912a425c67d71e5ae0cd45728ab9346ddff797..4081cdeb7aa0903ceac53cbfd1a30eac1f5a5a2c 100644 (file)
--- a/tests/mini-record.c
+++ b/tests/mini-record.c
@@ -214,6 +214,7 @@ pid_t child;
 
 static void terminate(void)
 {
+       assert(child);
        kill(child, SIGTERM);
        exit(1);
 }

diff --git a/tests/mini-server-name.c b/tests/mini-server-name.c
index 4f241c66ffe2579853940e24a350cfe891854439..cc431adc118a107a376d43d343e684630fe8ace6 100644 (file)
--- a/tests/mini-server-name.c
+++ b/tests/mini-server-name.c
@@ -148,6 +148,7 @@ pid_t child;
 
 static void terminate(void)
 {
+       assert(child);
        kill(child, SIGTERM);
        exit(1);
 }

diff --git a/tests/mini-termination.c b/tests/mini-termination.c
index f0b232cefa79e0c751f702d272c3a0eca6b2871f..2bb2d4735e77d0d98d93309f594cfc549e303802 100644 (file)
--- a/tests/mini-termination.c
+++ b/tests/mini-termination.c
@@ -200,6 +200,7 @@ pid_t child;
 
 static void terminate(void)
 {
+       assert(child);
        kill(child, SIGTERM);
        exit(1);
 }

diff --git a/tests/mini-tls-nonblock.c b/tests/mini-tls-nonblock.c
index 4a58bcdeecd33fbaf54fcb6fc799a81d9aa3cf01..b2c6578b88df6b354b3de5f131c5fc7dbc44e046 100644 (file)
--- a/tests/mini-tls-nonblock.c
+++ b/tests/mini-tls-nonblock.c
@@ -218,6 +218,7 @@ pid_t child;
 
 static void terminate(void)
 {
+       assert(child);
        kill(child, SIGTERM);
        exit(1);
 }

diff --git a/tests/prf.c b/tests/prf.c
index aa4f36af6a0892a8aae1bf33b1987de52c36dd0e..02a174d5ac25938c1359287cd26bc0b3aa34b899 100644 (file)
--- a/tests/prf.c
+++ b/tests/prf.c
@@ -346,8 +346,10 @@ static void terminate(void)
 {
        int status = 0;
 
-       kill(child, SIGTERM);
-       wait(&status);
+       if (child) {
+               kill(child, SIGTERM);
+               wait(&status);
+       }
        exit(1);
 }
 

diff --git a/tests/record-pad.c b/tests/record-pad.c
index 1402a9ad933b86479aac9fa3bb1dbae0ee6a1256..f625163179d6dc87b25c70e546691f98cafd985a 100644 (file)
--- a/tests/record-pad.c
+++ b/tests/record-pad.c
@@ -181,6 +181,7 @@ pid_t child;
 
 static void terminate(void)
 {
+       assert(child);
        kill(child, SIGTERM);
        exit(1);
 }

diff --git a/tests/record-retvals.c b/tests/record-retvals.c
index 73f038c0c9557e3995b55bb46b67fe323e0fbdb9..9d3d131e76fd3b23f052f758c076dcefd5a9c1b1 100644 (file)
--- a/tests/record-retvals.c
+++ b/tests/record-retvals.c
@@ -257,6 +257,7 @@ pid_t child;
 
 static void terminate(void)
 {
+       assert(child);
        kill(child, SIGTERM);
        exit(1);
 }

diff --git a/tests/recv-data-before-handshake.c b/tests/recv-data-before-handshake.c
index 0aedfca47b51b86919ac212e5b997684cc45dd8a..98a5645c8cbd253e652a2a2456567f44cef3c5b7 100644 (file)
--- a/tests/recv-data-before-handshake.c
+++ b/tests/recv-data-before-handshake.c
@@ -186,6 +186,7 @@ pid_t child;
 
 static void terminate(void)
 {
+       assert(child);
        kill(child, SIGTERM);
        exit(1);
 }

diff --git a/tests/send-data-before-handshake.c b/tests/send-data-before-handshake.c
index d1e6f5b015ca7f1c1f907594d507c01d3b94ac28..5c15dda0caffa15be94a1ba0517bece8e3da2ca5 100644 (file)
--- a/tests/send-data-before-handshake.c
+++ b/tests/send-data-before-handshake.c
@@ -182,6 +182,7 @@ pid_t child;
 
 static void terminate(void)
 {
+       assert(child);
        kill(child, SIGTERM);
        exit(1);
 }

diff --git a/tests/session-tickets-missing.c b/tests/session-tickets-missing.c
index 8f5f1269779d2b3634287c347e24dee5086312c2..509e43f639c32f2658ee929142d12afeff5b5896 100644 (file)
--- a/tests/session-tickets-missing.c
+++ b/tests/session-tickets-missing.c
@@ -169,6 +169,7 @@ pid_t child;
 
 static void terminate(void)
 {
+       assert(child);
        kill(child, SIGTERM);
        exit(1);
 }

diff --git a/tests/session-tickets-ok.c b/tests/session-tickets-ok.c
index d3c9a0851600c84e674994970ee8414e358f8ee3..ce06b222e350ece50c1a37c3c6dba6fbffddf349 100644 (file)
--- a/tests/session-tickets-ok.c
+++ b/tests/session-tickets-ok.c
@@ -140,6 +140,7 @@ pid_t child;
 
 static void terminate(void)
 {
+       assert(child);
        kill(child, SIGTERM);
        exit(1);
 }

diff --git a/tests/srp.c b/tests/srp.c
index 64eb52aaf22dfba9c5acd837c4752d4610ad4a6b..6fb0f02cd64f5da1495d506b624503df6a6779b6 100644 (file)
--- a/tests/srp.c
+++ b/tests/srp.c
@@ -186,7 +186,7 @@ pid_t child;
 static void terminate(void)
 {
        int status;
-
+       assert(child);
        kill(child, SIGTERM);
        wait(&status);
        exit(1);

diff --git a/tests/tls-client-with-seccomp.c b/tests/tls-client-with-seccomp.c
index 53e8e972397d9ad1cba9f9c41d81e35c4cdfa664..dc78737ef74f6258bde08566d6c26aec9125da05 100644 (file)
--- a/tests/tls-client-with-seccomp.c
+++ b/tests/tls-client-with-seccomp.c
@@ -158,7 +158,7 @@ pid_t child;
 static void terminate(void)
 {
        int status;
-
+       assert(child);
        kill(child, SIGTERM);
        wait(&status);
        exit(1);

diff --git a/tests/tls-etm.c b/tests/tls-etm.c
index 7a5d7076989a4400352bf2a92b5acd7775b3d277..17da1e2a5b41cd77e131cb41cd4f090c196c6dd6 100644 (file)
--- a/tests/tls-etm.c
+++ b/tests/tls-etm.c
@@ -180,6 +180,7 @@ pid_t child;
 
 static void terminate(void)
 {
+       assert(child);
        kill(child, SIGTERM);
        exit(1);
 }

diff --git a/tests/tls-with-seccomp.c b/tests/tls-with-seccomp.c
index 9aff7a95a355def249b62e339a903b65a436a205..21340fd95c69f67d6eca19e98bfbd13299eb9450 100644 (file)
--- a/tests/tls-with-seccomp.c
+++ b/tests/tls-with-seccomp.c
@@ -150,7 +150,7 @@ pid_t child;
 static void terminate(void)
 {
        int status;
-
+       assert(child);
        kill(child, SIGTERM);
        wait(&status);
        exit(1);

diff --git a/tests/tls12-rehandshake-cert-2.c b/tests/tls12-rehandshake-cert-2.c
index c1e3013ff1974456ef879d2c97a0b7665d2f0562..3a96f5b73af61fabcd84139062aa6844a974df9d 100644 (file)
--- a/tests/tls12-rehandshake-cert-2.c
+++ b/tests/tls12-rehandshake-cert-2.c
@@ -202,6 +202,7 @@ pid_t child;
 
 static void terminate(void)
 {
+       assert(child);
        kill(child, SIGTERM);
        exit(1);
 }

diff --git a/tests/tls12-rehandshake-cert-3.c b/tests/tls12-rehandshake-cert-3.c
index 1d3d61fc9aa6d0ba18f43b01181487b2797f8fdb..4fcbc6c3ae1a60b78be08cbf2ad1c86db9c08868 100644 (file)
--- a/tests/tls12-rehandshake-cert-3.c
+++ b/tests/tls12-rehandshake-cert-3.c
@@ -167,6 +167,7 @@ pid_t child;
 
 static void terminate(void)
 {
+       assert(child);
        kill(child, SIGTERM);
        exit(1);
 }

diff --git a/tests/tls13/key_limits.c b/tests/tls13/key_limits.c
index d76bcde428b0a175ba07302e03357166a6c76642..e2e533aebea715d1ef2df3943c7bb35da4e02541 100644 (file)
--- a/tests/tls13/key_limits.c
+++ b/tests/tls13/key_limits.c
@@ -182,6 +182,7 @@ pid_t child;
 
 static void terminate(void)
 {
+       assert(child);
        kill(child, SIGTERM);
        exit(1);
 }

diff --git a/tests/tls13/prf-early.c b/tests/tls13/prf-early.c
index cd4813671c1e0d29d8e8ccd99888cf5637266d9c..b97dc2424a62236d5a14a5ca0d6829a87667d01d 100644 (file)
--- a/tests/tls13/prf-early.c
+++ b/tests/tls13/prf-early.c
@@ -286,8 +286,10 @@ static void terminate(void)
 {
        int status = 0;
 
-       kill(child, SIGTERM);
-       wait(&status);
+       if (child) {
+               kill(child, SIGTERM);
+               wait(&status);
+       }
        exit(1);
 }
 

diff --git a/tests/tls13/prf.c b/tests/tls13/prf.c
index e03544a0426f0b0918aaa2322f824fc9f0c07341..a83fda5ce6c86fdd7f0e824918452c7ca5bf15bc 100644 (file)
--- a/tests/tls13/prf.c
+++ b/tests/tls13/prf.c
@@ -257,8 +257,10 @@ static void terminate(void)
 {
        int status = 0;
 
-       kill(child, SIGTERM);
-       wait(&status);
+       if (child) {
+               kill(child, SIGTERM);
+               wait(&status);
+       }
        exit(1);
 }
 

diff --git a/tests/tlsext-decoding.c b/tests/tlsext-decoding.c
index b0734b4b11854ae75e38480641ad0e92858f163e..2794d2c5e396c087e5322cbe4a6f81bd4700afeb 100644 (file)
--- a/tests/tlsext-decoding.c
+++ b/tests/tlsext-decoding.c
@@ -174,7 +174,7 @@ pid_t child;
 static void terminate(void)
 {
        int status;
-
+       assert(child);
        kill(child, SIGTERM);
        wait(&status);
        exit(1);