test-getaddrinfo: skip (don't fail) this test when there's no network

* tests/test-getaddrinfo.c: Skip test upon failure with EAI_AGAIN,
on the presumption that it means you lack network access.

diff --git a/ChangeLog b/ChangeLog
index 3dab71e752fb95863a542bdbe2d9b0514fba799d..3b3a0f0235e9fa4de5a53953e029f86678f2d4d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-27  Mark McLoughlin  <markmc@redhat.com>
+
+       test-getaddrinfo: skip (don't fail) this test when there's no network
+       * tests/test-getaddrinfo.c: Skip test upon failure with EAI_AGAIN,
+       on the presumption that it means you lack network access.
+
 2009-01-26  Jim Meyering  <meyering@redhat.com>
 
        fflush: avoid warnings on modern systems

diff --git a/tests/test-getaddrinfo.c b/tests/test-getaddrinfo.c
index a887cb1a99e11810d5b4a3912879d763bb645553..a8b2fd5d4615cb2166061b05fe3a4e0f46d64df9 100644 (file)
--- a/tests/test-getaddrinfo.c
+++ b/tests/test-getaddrinfo.c
@@ -1,6 +1,6 @@
 /* Test the getaddrinfo module.
 
-   Copyright (C) 2006-2008 Free Software Foundation, Inc.
+   Copyright (C) 2006-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -64,6 +64,14 @@ int simple (char *host, char *service)
 
   if (res != 0)
     {
+      /* EAI_AGAIN is returned if no network is available. Don't fail
+        the test merely because someone is down the country on their
+        in-law's farm. */
+      if (res == EAI_AGAIN)
+       {
+         fprintf (stderr, "skipping getaddrinfo test: no network?\n");
+         return 77;
+       }
       /* IRIX reports EAI_NONAME for "https".  Don't fail the test
         merely because of this.  */
       if (res == EAI_NONAME)