test-getcwd.c: avoid new set-but-not-used warning

* tests/test-getcwd.c (test_abort_bug): Exit nonzero for any problem,
not just the glibc/abort one that getcwd-abort-bug.m4 detects.
This also adds an additional test for an unlikely chdir("..") failure.
* m4/getcwd-abort-bug.m4: Update this now-duplicated code to match,
and adjust the code that sets gl_cv_func_getcwd_abort_bug accordingly.

diff --git a/ChangeLog b/ChangeLog
index 3cc245ed3c2854e525f6d2a1b5d95ab45e3f77b4..dc01efd6c17947df71901b7d2457331a855fd338 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2011-04-29  Jim Meyering  <meyering@redhat.com>
 
+       test-getcwd.c: avoid new set-but-not-used warning
+       * tests/test-getcwd.c (test_abort_bug): Exit nonzero for any problem,
+       not just the glibc/abort one that getcwd-abort-bug.m4 detects.
+       * m4/getcwd-abort-bug.m4: Update this now-duplicated code to match,
+       and adjust the code that sets gl_cv_func_getcwd_abort_bug accordingly.
+
        test-hash.c: avoid a new shadowing warning
        * tests/test-hash.c (main): Don't shadow "dup".
 

diff --git a/m4/getcwd-abort-bug.m4 b/m4/getcwd-abort-bug.m4
index 0b59a6bf2174f6fe8e03dd9c73ded1b8b874b5f9..fd6820dc605a758002d72eb1782345303c49fa33 100644 (file)
--- a/m4/getcwd-abort-bug.m4
+++ b/m4/getcwd-abort-bug.m4
@@ -1,4 +1,4 @@
-# serial 3
+# serial 4
 # Determine whether getcwd aborts when the length of the working directory
 # name is unusually large.  Any length between 4k and 16k trigger the bug
 # when using glibc-2.4.90-9 or older.
@@ -65,7 +65,7 @@ main ()
 
   cwd = getcwd (NULL, 0);
   if (cwd == NULL)
-    return 0;
+    return 2;
 
   initial_cwd_len = strlen (cwd);
   free (cwd);
@@ -92,15 +92,22 @@ main ()
   while (0 < d--)
     {
       if (chdir ("..") < 0)
-        break;
+        {
+          fail = 5;
+          break;
+        }
       rmdir (dir_name);
     }
 
-  return 0;
+  return fail;
 }
           ]])],
     [gl_cv_func_getcwd_abort_bug=no],
-    [gl_cv_func_getcwd_abort_bug=yes],
+    dnl A "regular" nonzero return does not indicate this bug.
+    dnl An abort will provoke an exit code of something like 134 (128 + 6).
+    [test $? -gt 128 \
+      && gl_cv_func_getcwd_abort_bug=yes \
+      || gl_cv_func_getcwd_abort_bug=no],
     [gl_cv_func_getcwd_abort_bug=yes])
   ])
   AS_IF([test $gl_cv_func_getcwd_abort_bug = yes], [$1], [$2])

diff --git a/tests/test-getcwd.c b/tests/test-getcwd.c
index 0e0f90f24175a6a35675903025340b76cb6d2160..14a526f65e7aa3ade68155cc5420b4dc0e149b7d 100644 (file)
--- a/tests/test-getcwd.c
+++ b/tests/test-getcwd.c
@@ -55,7 +55,7 @@ test_abort_bug (void)
 
   cwd = getcwd (NULL, 0);
   if (cwd == NULL)
-    return 0;
+    return 2;
 
   initial_cwd_len = strlen (cwd);
   free (cwd);
@@ -82,11 +82,14 @@ test_abort_bug (void)
   while (0 < d--)
     {
       if (chdir ("..") < 0)
-        break;
+        {
+          fail = 5;
+          break;
+        }
       rmdir (dir_name);
     }
 
-  return 0;
+  return fail;
 }
 
 /* The length of this name must be 8.  */