test-stat: don't allocate PATH_MAX bytes

POSIX allows systems (like Hurd) that don't define PATH_MAX, or
which define it larger than a reasonable stack allocation should
be.  The test originally used stack allocation to avoid portability
problems with getcwd, but the getcwd-lgpl module solves those.

* tests/test-stat.h (test_stat_func): Don't stack-allocate a
PATH_MAX-sized buffer.
* modules/openat-tests (Depends-on): Add getcwd-lgpl, drop pathmax.
* modules/stat-tests (Depends-on): Likewise.
* tests/test-fstatat.c (includes): Drop pathmax.h.
* tests/test-stat.c (includes): Likewise.
Reported by Bruno Haible.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index 7fe901724338ed22601f88acc1496174bda035b2..1758d670f55302fa4fc77fe841e9f73c081f6102 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-06-20  Eric Blake  <eblake@redhat.com>
+
+       test-stat: don't allocate PATH_MAX bytes
+       * tests/test-stat.h (test_stat_func): Don't stack-allocate a
+       PATH_MAX-sized buffer.
+       * modules/openat-tests (Depends-on): Add getcwd-lgpl, drop pathmax.
+       * modules/stat-tests (Depends-on): Likewise.
+       * tests/test-fstatat.c (includes): Drop pathmax.h.
+       * tests/test-stat.c (includes): Likewise.
+       Reported by Bruno Haible.
+
 2011-06-20  Bruno Haible  <bruno@clisp.org>
 
        float: Work around <float.h> bugs on FreeBSD/x86, AIX with GCC, IRIX.

diff --git a/modules/openat-tests b/modules/openat-tests
index 8b0a2b9e83b0ccc99d9e4750be4394b34e7263af..b83fb721d293ce71089f2b233ddbd8b619e47b2d 100644 (file)
--- a/modules/openat-tests
+++ b/modules/openat-tests
@@ -16,9 +16,9 @@ tests/signature.h
 tests/macros.h
 
 Depends-on:
+getcwd-lgpl
 ignore-value
 mgetgroups
-pathmax
 progname
 usleep
 stat-time

diff --git a/modules/stat-tests b/modules/stat-tests
index 74d558c8db25ad80ba095e7c7e73d3312e31a991..9c00ce54d769e34aa6f2bed575776c2e519f9ced 100644 (file)
--- a/modules/stat-tests
+++ b/modules/stat-tests
@@ -5,7 +5,7 @@ tests/signature.h
 tests/macros.h
 
 Depends-on:
-pathmax
+getcwd-lgpl
 same-inode
 stdbool
 symlink

diff --git a/tests/test-fstatat.c b/tests/test-fstatat.c
index dda0cd224105861afe5e9092c19ef539d64482ca..aef113655204e3ba3fcd12797202e1c647034f2c 100644 (file)
--- a/tests/test-fstatat.c
+++ b/tests/test-fstatat.c
@@ -31,7 +31,6 @@ SIGNATURE_CHECK (fstatat, int, (int, char const *, struct stat *, int));
 #include <unistd.h>
 
 #include "openat.h"
-#include "pathmax.h"
 #include "progname.h"
 #include "same-inode.h"
 #include "ignore-value.h"

diff --git a/tests/test-stat.c b/tests/test-stat.c
index 4cda08908b6aedf3e28a798e429da99dd95ea2d9..cd74491f05e2e368a972c255d06f4b427f82d3c2 100644 (file)
--- a/tests/test-stat.c
+++ b/tests/test-stat.c
@@ -33,7 +33,6 @@ SIGNATURE_CHECK (stat, int, (char const *, struct stat *));
 #include <stdio.h>
 #include <unistd.h>
 
-#include "pathmax.h"
 #include "same-inode.h"
 #include "macros.h"
 

diff --git a/tests/test-stat.h b/tests/test-stat.h
index 22552dce03d58b10159d33d7dd9f3e7940ce9260..3c8f7add0f6a8d85514bd071cd6e6fcd0fb7a941 100644 (file)
--- a/tests/test-stat.h
+++ b/tests/test-stat.h
@@ -27,9 +27,9 @@ test_stat_func (int (*func) (char const *, struct stat *), bool print)
 {
   struct stat st1;
   struct stat st2;
-  char cwd[PATH_MAX];
+  char *cwd = getcwd (NULL, 0);
 
-  ASSERT (getcwd (cwd, PATH_MAX) == cwd);
+  ASSERT (cwd);
   ASSERT (func (".", &st1) == 0);
   ASSERT (func ("./", &st2) == 0);
   ASSERT (SAME_INODE (st1, st2));