Package: lilypond / 2.19.83-1~exp1

0006-Make-sockets.test-more-robust.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
From 4bd9feda896f146786de6481a63b449a1904047c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 19 Jan 2010 18:49:06 +0100
Subject: Make `sockets.test' more robust.

* test-suite/tests/socket.test ("AF_INET6/SOCK_STREAM"): Gracefully
  handle cases where this combination is not supported.
---
 test-suite/tests/socket.test | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

--- a/guile18/test-suite/tests/socket.test
+++ b/guile18/test-suite/tests/socket.test
@@ -1,6 +1,6 @@
 ;;;; socket.test --- test socket functions     -*- scheme -*-
 ;;;;
-;;;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;;;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 ;;;;
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
@@ -341,7 +341,9 @@
 
       ;; testing `bind', `listen' and `connect' on stream-oriented sockets
 
-      (let ((server-socket (socket AF_INET6 SOCK_STREAM 0))
+      (let ((server-socket
+             ;; Some platforms don't support this protocol/family combination.
+             (false-if-exception (socket AF_INET6 SOCK_STREAM 0)))
 	    (server-bound? #f)
 	    (server-listening? #f)
 	    (server-pid #f)
@@ -350,6 +352,8 @@
 	    (client-port 9998))
 
 	(pass-if "bind"
+          (if (not server-socket)
+              (throw 'unresolved))
 	  (catch 'system-error
 	    (lambda ()
 	      (bind server-socket AF_INET6 ipv6-addr server-port)
@@ -361,8 +365,10 @@
 		      (else (apply throw args)))))))
 
 	(pass-if "bind/sockaddr"
-	  (let* ((sock (socket AF_INET6 SOCK_STREAM 0))
+	  (let* ((sock (false-if-exception (socket AF_INET6 SOCK_STREAM 0)))
 		 (sockaddr (make-socket-address AF_INET6 ipv6-addr client-port)))
+            (if (not sock)
+                (throw 'unresolved))
 	    (catch 'system-error
 	      (lambda ()
 		(bind sock sockaddr)