More explicit tests of longjmp.

1 files changed, 17 insertions, 4 deletions

diff --git a/src/regress/lib/libc/longjmp/longjmp.c b/src/regress/lib/libc/longjmp/longjmp.c
index d8b9fe86bd..4d8edb4716 100644
--- a/src/regress/lib/libc/longjmp/longjmp.c
+++ b/src/regress/lib/libc/longjmp/longjmp.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: longjmp.c,v 1.1 2002/01/04 13:02:57 art Exp $ */
+/*      $OpenBSD: longjmp.c,v 1.2 2002/01/04 13:33:17 art Exp $ */
 /*
  * Artur Grabowski <art@openbsd.org> Public Domain.
  */
@@ -16,21 +16,34 @@ jmp_buf buf;
  * When longjmp is passed the incorrect arg (0), it should translate it into
  * something better.
  *
- * Test is simple. rlimit the cpu time and throw an incorrect longjmp. If 0
- * is not translated we'll spin until we hit the cpu time limit.
+ * The rlimit is here in case we start spinning.
  */
 int
 main()
 {
         struct rlimit rl;
+        volatile int i, expect;
 
         rl.rlim_cur = 2;
         rl.rlim_max = 2;
         if (setrlimit(RLIMIT_CPU, &rl) < 0)
                 err(1, "setrlimit");
 
-        if (setjmp(buf) == 0)
+        expect = 0;
+        i = setjmp(buf);
+        if (i == 0 && expect != 0)
+                errx(1, "setjmp returns 0 on longjmp(.., 0)");
+        if (expect == 0) {
+                expect = -1;
                 longjmp(buf, 0);
+        }
+
+        expect = 0;
+        i = setjmp(buf);
+        if (i != expect)
+                errx(1, "bad return from setjmp %d/%d", expect, i);
+        if (expect < 1000)
+                longjmp(buf, expect += 2);
 
         return 0;
 }