X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-c-stack.c;h=cc27b43bda21ecf89c6d7b74a5fc4469c4efad10;hb=0568a6e8985cc2ae9c57cb03fc81f5305458b7d2;hp=13c1a125608d076e730cfdf80482dca19574331a;hpb=c3b5d31b4526468a99602704eaea1f95cbd78e6d;p=gnulib.git

diff --git a/tests/test-c-stack.c b/tests/test-c-stack.c
index 13c1a1256..cc27b43bd 100644
--- a/tests/test-c-stack.c
+++ b/tests/test-c-stack.c
@@ -1,5 +1,5 @@
 /* Test of c-stack module.
-   Copyright (C) 2002, 2004, 2006, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2006, 2008-2011 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
@@ -20,49 +20,57 @@
 
 #include "exitfail.h"
 #include <stdio.h>
-#include <stdlib.h>
 #if HAVE_SETRLIMIT
+/* At least FreeBSD 5.0 needs extra headers before <sys/resource.h>
+   will compile.  */
+# include <sys/types.h>
+# include <sys/time.h>
 # include <sys/resource.h>
 #endif
 
-#define ASSERT(expr) \
-  do									     \
-    {									     \
-      if (!(expr))							     \
-        {								     \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);						     \
-          abort ();							     \
-        }								     \
-    }									     \
-  while (0)
+#include "macros.h"
 
-static long
-recurse (char *p)
+char *program_name;
+
+static volatile int *
+recurse_1 (volatile int n, volatile int *p)
 {
-  char array[500];
-  array[0] = 1;
-  return *p + recurse (array);
+  if (n >= 0)
+    *recurse_1 (n + 1, p) += n;
+  return p;
 }
 
-char *program_name;
+static int
+recurse (volatile int n)
+{
+  int sum = 0;
+  return *recurse_1 (n, &sum);
+}
 
 int
 main (int argc, char **argv)
 {
-   program_name = argv[0];
 #if HAVE_SETRLIMIT && defined RLIMIT_STACK
-   /* Before starting the endless recursion, try to be friendly to the
-      user's machine.  On some Linux 2.2.x systems, there is no stack
-      limit for user processes at all.  We don't want to kill such
-      systems.  */
-   struct rlimit rl;
-   rl.rlim_cur = rl.rlim_max = 0x100000; /* 1 MB */
-   setrlimit (RLIMIT_STACK, &rl);
+  /* Before starting the endless recursion, try to be friendly to the
+     user's machine.  On some Linux 2.2.x systems, there is no stack
+     limit for user processes at all.  We don't want to kill such
+     systems.  */
+  struct rlimit rl;
+  rl.rlim_cur = rl.rlim_max = 0x100000; /* 1 MB */
+  setrlimit (RLIMIT_STACK, &rl);
 #endif
 
-  if (c_stack_action (0) == 0)
-    return recurse ("\1");
+  program_name = argv[0];
+  if (c_stack_action (NULL) == 0)
+    {
+      if (1 < argc)
+        {
+          exit_failure = 77;
+          ++*argv[argc]; /* Intentionally dereference NULL.  */
+        }
+      return recurse (0);
+    }
+  fputs ("skipping test: ", stderr);
   perror ("c_stack_action");
   return 77;
 }