* tests/test-fprintf-posix3.c: Include "resource-ext.h".
(main): Perform test also when getrlimit and setrlimit don't exist or
when setrlimit of RLIMIT_DATA fails (like on Cygwin). Instead of
limiting the address space size using setrlimit, compare the address
space size before and after the the test.
* tests/test-dprintf-posix2.c: Likewise.
* tests/test-fprintf-posix3.sh: Update skip messages.
* tests/test-dprintf-posix2.sh: Likewise.
* modules/fprintf-posix-tests (Depends-on): Add get-rusage-as.
* modules/dprintf-posix-tests (Depends-on): Likewise.
Reported by Bruce Korb <bkorb@gnu.org> and
Gary V. Vaughan <gary@gnu.org>.
2011-01-18 Bruno Haible <bruno@clisp.org>
+ *printf-posix: Avoid test failures. Make tests work on MacOS X, Cygwin.
+ * tests/test-fprintf-posix3.c: Include "resource-ext.h".
+ (main): Perform test also when getrlimit and setrlimit don't exist or
+ when setrlimit of RLIMIT_DATA fails (like on Cygwin). Instead of
+ limiting the address space size using setrlimit, compare the address
+ space size before and after the the test.
+ * tests/test-dprintf-posix2.c: Likewise.
+ * tests/test-fprintf-posix3.sh: Update skip messages.
+ * tests/test-dprintf-posix2.sh: Likewise.
+ * modules/fprintf-posix-tests (Depends-on): Add get-rusage-as.
+ * modules/dprintf-posix-tests (Depends-on): Likewise.
+ Reported by Bruce Korb <bkorb@gnu.org> and
+ Gary V. Vaughan <gary@gnu.org>.
+
+2011-01-18 Bruno Haible <bruno@clisp.org>
+
get-rusage-as: Improvement for Cygwin.
* lib/get-rusage-as.c (get_rusage_as_via_iterator): On Windows, ignore
areas that are merely reserved.
Depends-on:
stdint
+get-rusage-as
configure.ac:
AC_CHECK_FUNCS_ONCE([getrlimit setrlimit])
Depends-on:
stdint
+get-rusage-as
configure.ac:
AC_CHECK_FUNCS_ONCE([getrlimit setrlimit])
#include <stdio.h>
-#if HAVE_GETRLIMIT && HAVE_SETRLIMIT
-
#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
#include <string.h>
#include <unistd.h>
#include <errno.h>
+#if HAVE_GETRLIMIT && HAVE_SETRLIMIT
+# include <sys/types.h>
+# include <sys/time.h>
+# include <sys/resource.h>
+#endif
+
+#include "resource-ext.h"
+
/* Test against a memory leak in the fprintf replacement. */
/* Number of iterations across the loop. */
int
main (int argc, char *argv[])
{
- struct rlimit limit;
+ uintptr_t initial_rusage_as;
int arg;
- int repeat;
+ int result;
/* Limit the amount of malloc()ed memory to MAX_ALLOC_TOTAL or less. */
/* On BSD systems, malloc() is limited by RLIMIT_DATA. */
-#ifdef RLIMIT_DATA
- if (getrlimit (RLIMIT_DATA, &limit) < 0)
- return 77;
- if (limit.rlim_max == RLIM_INFINITY || limit.rlim_max > MAX_ALLOC_TOTAL)
- limit.rlim_max = MAX_ALLOC_TOTAL;
- limit.rlim_cur = limit.rlim_max;
- if (setrlimit (RLIMIT_DATA, &limit) < 0)
- return 77;
+#if HAVE_GETRLIMIT && HAVE_SETRLIMIT && defined RLIMIT_DATA
+ {
+ struct rlimit limit;
+
+ if (getrlimit (RLIMIT_DATA, &limit) >= 0)
+ {
+ if (limit.rlim_max == RLIM_INFINITY || limit.rlim_max > MAX_ALLOC_TOTAL)
+ limit.rlim_max = MAX_ALLOC_TOTAL;
+ limit.rlim_cur = limit.rlim_max;
+ (void) setrlimit (RLIMIT_DATA, &limit);
+ }
+ }
#endif
- /* On Linux systems, malloc() is limited by RLIMIT_AS. */
-#ifdef RLIMIT_AS
- if (getrlimit (RLIMIT_AS, &limit) < 0)
+ /* On Linux systems, malloc() is limited by RLIMIT_AS.
+ On some systems, setrlimit of RLIMIT_AS doesn't work but get_rusage_as ()
+ does. Allow the address space size to grow by at most MAX_ALLOC_TOTAL. */
+ initial_rusage_as = get_rusage_as ();
+ if (initial_rusage_as == 0)
return 77;
- if (limit.rlim_max == RLIM_INFINITY || limit.rlim_max > MAX_ALLOC_TOTAL)
- limit.rlim_max = MAX_ALLOC_TOTAL;
- limit.rlim_cur = limit.rlim_max;
- if (setrlimit (RLIMIT_AS, &limit) < 0)
- return 77;
-#endif
arg = atoi (argv[1]);
if (arg == 0)
if (memory == NULL)
return 1;
memset (memory, 17, MAX_ALLOC_TOTAL);
- return 78;
+ result = 78;
}
-
- /* Perform the test and test whether it triggers a permanent memory
- allocation of more than MAX_ALLOC_TOTAL bytes. */
-
- for (repeat = 0; repeat < NUM_ROUNDS; repeat++)
+ else
{
- /* This may produce a temporary memory allocation of 11000 bytes.
- but should not result in a permanent memory allocation. */
- if (dprintf (STDOUT_FILENO, "%011000d\n", 17) == -1
- && errno == ENOMEM)
- return 1;
+ /* Perform the test and test whether it triggers a permanent memory
+ allocation of more than MAX_ALLOC_TOTAL bytes. */
+ int repeat;
+
+ for (repeat = 0; repeat < NUM_ROUNDS; repeat++)
+ {
+ /* This may produce a temporary memory allocation of 11000 bytes.
+ but should not result in a permanent memory allocation. */
+ if (dprintf (STDOUT_FILENO, "%011000d\n", 17) == -1
+ && errno == ENOMEM)
+ return 1;
+ }
+
+ result = 0;
}
- return 0;
-}
-
-#else
+ if (get_rusage_as () > initial_rusage_as + MAX_ALLOC_TOTAL)
+ return 1;
-int
-main (int argc, char *argv[])
-{
- return 77;
+ return result;
}
-
-#endif
) 2>/dev/null
malloc_result=$?
if test $malloc_result = 77; then
- echo "Skipping test: getrlimit and setrlimit don't work"
+ echo "Skipping test: no way to determine address space size"
exit 77
fi
./test-dprintf-posix2${EXEEXT} 1 > /dev/null
result=$?
if test $result = 77; then
- echo "Skipping test: getrlimit and setrlimit don't work"
+ echo "Skipping test: no way to determine address space size"
exit 77
fi
if test $result != 0; then
fi
if test $malloc_result = 78; then
- echo "Skipping test: getrlimit and setrlimit don't work"
+ echo "Skipping test: get_rusage_as() doesn't work"
exit 77
fi
#include <stdio.h>
-#if HAVE_GETRLIMIT && HAVE_SETRLIMIT
-
#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
#include <string.h>
#include <errno.h>
+#if HAVE_GETRLIMIT && HAVE_SETRLIMIT
+# include <sys/types.h>
+# include <sys/time.h>
+# include <sys/resource.h>
+#endif
+
+#include "resource-ext.h"
+
/* Test against a memory leak in the fprintf replacement. */
/* Number of iterations across the loop. */
int
main (int argc, char *argv[])
{
- struct rlimit limit;
+ uintptr_t initial_rusage_as;
int arg;
- int repeat;
+ int result;
/* Limit the amount of malloc()ed memory to MAX_ALLOC_TOTAL or less. */
/* On BSD systems, malloc() is limited by RLIMIT_DATA. */
-#ifdef RLIMIT_DATA
- if (getrlimit (RLIMIT_DATA, &limit) < 0)
- return 77;
- if (limit.rlim_max == RLIM_INFINITY || limit.rlim_max > MAX_ALLOC_TOTAL)
- limit.rlim_max = MAX_ALLOC_TOTAL;
- limit.rlim_cur = limit.rlim_max;
- if (setrlimit (RLIMIT_DATA, &limit) < 0)
- return 77;
+#if HAVE_GETRLIMIT && HAVE_SETRLIMIT && defined RLIMIT_DATA
+ {
+ struct rlimit limit;
+
+ if (getrlimit (RLIMIT_DATA, &limit) >= 0)
+ {
+ if (limit.rlim_max == RLIM_INFINITY || limit.rlim_max > MAX_ALLOC_TOTAL)
+ limit.rlim_max = MAX_ALLOC_TOTAL;
+ limit.rlim_cur = limit.rlim_max;
+ (void) setrlimit (RLIMIT_DATA, &limit);
+ }
+ }
#endif
- /* On Linux systems, malloc() is limited by RLIMIT_AS. */
-#ifdef RLIMIT_AS
- if (getrlimit (RLIMIT_AS, &limit) < 0)
+ /* On Linux systems, malloc() is limited by RLIMIT_AS.
+ On some systems, setrlimit of RLIMIT_AS doesn't work but get_rusage_as ()
+ does. Allow the address space size to grow by at most MAX_ALLOC_TOTAL. */
+ initial_rusage_as = get_rusage_as ();
+ if (initial_rusage_as == 0)
return 77;
- if (limit.rlim_max == RLIM_INFINITY || limit.rlim_max > MAX_ALLOC_TOTAL)
- limit.rlim_max = MAX_ALLOC_TOTAL;
- limit.rlim_cur = limit.rlim_max;
- if (setrlimit (RLIMIT_AS, &limit) < 0)
- return 77;
-#endif
arg = atoi (argv[1]);
if (arg == 0)
if (memory == NULL)
return 1;
memset (memory, 17, MAX_ALLOC_TOTAL);
- return 78;
+ result = 78;
}
-
- /* Perform the test and test whether it triggers a permanent memory
- allocation of more than MAX_ALLOC_TOTAL bytes. */
-
- for (repeat = 0; repeat < NUM_ROUNDS; repeat++)
+ else
{
- /* This may produce a temporary memory allocation of 11000 bytes.
- but should not result in a permanent memory allocation. */
- if (fprintf (stdout, "%011000d\n", 17) == -1
- && errno == ENOMEM)
- return 1;
+ /* Perform the test and test whether it triggers a permanent memory
+ allocation of more than MAX_ALLOC_TOTAL bytes. */
+ int repeat;
+
+ for (repeat = 0; repeat < NUM_ROUNDS; repeat++)
+ {
+ /* This may produce a temporary memory allocation of 11000 bytes.
+ but should not result in a permanent memory allocation. */
+ if (fprintf (stdout, "%011000d\n", 17) == -1
+ && errno == ENOMEM)
+ return 1;
+ }
+
+ result = 0;
}
- return 0;
-}
-
-#else
+ if (get_rusage_as () > initial_rusage_as + MAX_ALLOC_TOTAL)
+ return 1;
-int
-main (int argc, char *argv[])
-{
- return 77;
+ return result;
}
-
-#endif
) 2>/dev/null
malloc_result=$?
if test $malloc_result = 77; then
- echo "Skipping test: getrlimit and setrlimit don't work"
+ echo "Skipping test: no way to determine address space size"
exit 77
fi
./test-fprintf-posix3${EXEEXT} 1 > /dev/null
result=$?
if test $result = 77; then
- echo "Skipping test: getrlimit and setrlimit don't work"
+ echo "Skipping test: no way to determine address space size"
exit 77
fi
if test $result != 0; then
fi
if test $malloc_result = 78; then
- echo "Skipping test: getrlimit and setrlimit don't work"
+ echo "Skipping test: get_rusage_as() doesn't work"
exit 77
fi
projects / gnulib.git / commitdiff