[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.5-214-g5d312f3

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=5d312f3c2c5db3a7677a9c8ec4306feabce8445f

The branch, stable-2.0 has been updated
       via  5d312f3c2c5db3a7677a9c8ec4306feabce8445f (commit)
      from  24dd9f6fe1449fa4de81d95ca659283c15e16931 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5d312f3c2c5db3a7677a9c8ec4306feabce8445f
Author: Andy Wingo <address@hidden>
Date:   Fri Jul 6 17:45:23 2012 +0200

    disable some uri tests if --disable-networking
    
    * test-suite/tests/web-uri.test: Disable some tests if we don't have
      inet-pton.

-----------------------------------------------------------------------

Summary of changes:
 test-suite/tests/web-uri.test |   73 +++++++++++++++++++++-------------------
 1 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/test-suite/tests/web-uri.test b/test-suite/tests/web-uri.test
index 7431025..4621a19 100644
--- a/test-suite/tests/web-uri.test
+++ b/test-suite/tests/web-uri.test
@@ -94,17 +94,18 @@
     (uri=? (build-uri 'http #:host "1.good.host")
            #:scheme 'http #:host "1.good.host" #:path ""))
 
-  (pass-if "http://192.0.2.1";
-    (uri=? (build-uri 'http #:host "192.0.2.1")
-           #:scheme 'http #:host "192.0.2.1" #:path ""))
+  (when (memq 'socket *features*)
+    (pass-if "http://192.0.2.1";
+      (uri=? (build-uri 'http #:host "192.0.2.1")
+             #:scheme 'http #:host "192.0.2.1" #:path ""))
 
-  (pass-if "http://[2001:db8::1]";
-    (uri=? (build-uri 'http #:host "2001:db8::1")
-           #:scheme 'http #:host "2001:db8::1" #:path ""))
+    (pass-if "http://[2001:db8::1]";
+      (uri=? (build-uri 'http #:host "2001:db8::1")
+             #:scheme 'http #:host "2001:db8::1" #:path ""))
 
-  (pass-if "http://[::ffff:192.0.2.1]";
-    (uri=? (build-uri 'http #:host "::ffff:192.0.2.1")
-           #:scheme 'http #:host "::ffff:192.0.2.1" #:path ""))
+    (pass-if "http://[::ffff:192.0.2.1]";
+      (uri=? (build-uri 'http #:host "::ffff:192.0.2.1")
+             #:scheme 'http #:host "::ffff:192.0.2.1" #:path "")))
 
   (pass-if-uri-exception "http://foo:not-a-port";
                          "Expected.*port"
@@ -155,24 +156,25 @@
     (uri=? (string->uri "http://1.good.host";)
            #:scheme 'http #:host "1.good.host" #:path ""))
 
-  (pass-if "http://192.0.2.1";
-    (uri=? (string->uri "http://192.0.2.1";)
-           #:scheme 'http #:host "192.0.2.1" #:path ""))
+  (when (memq 'socket *features*)
+    (pass-if "http://192.0.2.1";
+      (uri=? (string->uri "http://192.0.2.1";)
+             #:scheme 'http #:host "192.0.2.1" #:path ""))
 
-  (pass-if "http://[2001:db8::1]";
-    (uri=? (string->uri "http://[2001:db8::1]";)
-           #:scheme 'http #:host "2001:db8::1" #:path ""))
+    (pass-if "http://[2001:db8::1]";
+      (uri=? (string->uri "http://[2001:db8::1]";)
+             #:scheme 'http #:host "2001:db8::1" #:path ""))
 
-  (pass-if "http://[2001:db8::1]:80";
-    (uri=? (string->uri "http://[2001:db8::1]:80";)
-           #:scheme 'http
-           #:host "2001:db8::1"
-           #:port 80
-           #:path ""))
+    (pass-if "http://[2001:db8::1]:80";
+      (uri=? (string->uri "http://[2001:db8::1]:80";)
+             #:scheme 'http
+             #:host "2001:db8::1"
+             #:port 80
+             #:path ""))
 
-  (pass-if "http://[::ffff:192.0.2.1]";
-    (uri=? (string->uri "http://[::ffff:192.0.2.1]";)
-           #:scheme 'http #:host "::ffff:192.0.2.1" #:path ""))
+    (pass-if "http://[::ffff:192.0.2.1]";
+      (uri=? (string->uri "http://[::ffff:192.0.2.1]";)
+             #:scheme 'http #:host "::ffff:192.0.2.1" #:path "")))
 
   (pass-if "http://foo:";
     (uri=? (string->uri "http://foo:";)
@@ -227,17 +229,18 @@
     (equal? "ftp://address@hidden:22/baz";
             (uri->string (string->uri "ftp://address@hidden:22/baz";))))
   
-  (pass-if "http://192.0.2.1";
-    (equal? "http://192.0.2.1";
-            (uri->string (string->uri "http://192.0.2.1";))))
-
-  (pass-if "http://[2001:db8::1]";
-    (equal? "http://[2001:db8::1]";
-            (uri->string (string->uri "http://[2001:db8::1]";))))
-
-  (pass-if "http://[::ffff:192.0.2.1]";
-    (equal? "http://[::ffff:192.0.2.1]";
-            (uri->string (string->uri "http://[::ffff:192.0.2.1]";))))
+  (when (memq 'socket *features*)
+    (pass-if "http://192.0.2.1";
+      (equal? "http://192.0.2.1";
+              (uri->string (string->uri "http://192.0.2.1";))))
+
+    (pass-if "http://[2001:db8::1]";
+      (equal? "http://[2001:db8::1]";
+              (uri->string (string->uri "http://[2001:db8::1]";))))
+
+    (pass-if "http://[::ffff:192.0.2.1]";
+      (equal? "http://[::ffff:192.0.2.1]";
+              (uri->string (string->uri "http://[::ffff:192.0.2.1]";)))))
 
   (pass-if "http://foo:";
     (equal? "http://foo";


hooks/post-receive
-- 
GNU Guile