summaryrefslogtreecommitdiff
path: root/guile
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-02-11 23:04:32 +0100
committerNikos Mavrogiannopoulos <nmav@redhat.com>2016-02-15 10:05:20 +0100
commitfcf6f8427c55e8b068ada8735098b46597dadc71 (patch)
treeb4732f97c81a1bb1c746c3a460fa11e8b0e5ff34 /guile
parent53b7d41a26b3d61a62b2576e30d93f9f8c9aaef6 (diff)
downloadgnutls-fcf6f8427c55e8b068ada8735098b46597dadc71.tar.gz
guile: tests: Make sure no processes are left behind.
Before that, child processes would be left behind and become zombies. * guile/tests/anonymous-auth.scm, guile/tests/openpgp-auth.scm, guile/tests/session-record-port.scm, guile/tests/x509-auth.scm: Add (waitpid pid) call on the server side.
Diffstat (limited to 'guile')
-rw-r--r--guile/tests/anonymous-auth.scm3
-rw-r--r--guile/tests/openpgp-auth.scm3
-rw-r--r--guile/tests/session-record-port.scm1
-rw-r--r--guile/tests/x509-auth.scm3
4 files changed, 7 insertions, 3 deletions
diff --git a/guile/tests/anonymous-auth.scm b/guile/tests/anonymous-auth.scm
index d01884d749..a12eeb5b1d 100644
--- a/guile/tests/anonymous-auth.scm
+++ b/guile/tests/anonymous-auth.scm
@@ -71,7 +71,8 @@
(let* ((buf (make-u8vector (u8vector-length %message)))
(amount (record-receive! server buf)))
(bye server close-request/rdwr)
- (and (= amount (u8vector-length %message))
+ (and (zero? (cdr (waitpid pid)))
+ (= amount (u8vector-length %message))
(equal? buf %message))))
;; client-side (child process)
diff --git a/guile/tests/openpgp-auth.scm b/guile/tests/openpgp-auth.scm
index 49b4817435..8c732ce077 100644
--- a/guile/tests/openpgp-auth.scm
+++ b/guile/tests/openpgp-auth.scm
@@ -81,7 +81,8 @@
(let ((msg (read (session-record-port server)))
(auth-type (session-authentication-type server)))
(bye server close-request/rdwr)
- (and (eq? auth-type credentials/certificate)
+ (and (zero? (cdr (waitpid pid)))
+ (eq? auth-type credentials/certificate)
(equal? msg %message))))
;; client-side (child process)
diff --git a/guile/tests/session-record-port.scm b/guile/tests/session-record-port.scm
index 8291880e27..0eafefafa7 100644
--- a/guile/tests/session-record-port.scm
+++ b/guile/tests/session-record-port.scm
@@ -100,6 +100,7 @@
;; Make sure we got everything right.
(and (eq? (session-record-port server)
(session-record-port server))
+ (zero? (cdr (waitpid pid)))
(= amount (u8vector-length %message))
(equal? buf %message)
(eof-object?
diff --git a/guile/tests/x509-auth.scm b/guile/tests/x509-auth.scm
index 609251d473..21f192fa54 100644
--- a/guile/tests/x509-auth.scm
+++ b/guile/tests/x509-auth.scm
@@ -87,7 +87,8 @@
(let ((msg (read (session-record-port server)))
(auth-type (session-authentication-type server)))
(bye server close-request/rdwr)
- (and (eq? auth-type credentials/certificate)
+ (and (zero? (cdr (waitpid pid)))
+ (eq? auth-type credentials/certificate)
(equal? msg %message))))
;; client-side (child process)