foreach: make test more accurate, fix for 64-bit gcc 4.4.3

[ccan] / ccan / foreach / test / run-nested.c

diff --git a/ccan/foreach/test/run-nested.c b/ccan/foreach/test/run-nested.c
index 13ab46678b6c6e1e9de83ff35394a886f29360a0..17fa2f16667c5cc881b00aa21f7c8dbf2b478e00 100644 (file)
--- a/ccan/foreach/test/run-nested.c
+++ b/ccan/foreach/test/run-nested.c
@@ -2,6 +2,7 @@
 #include <ccan/tap/tap.h>
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 #include <ccan/foreach/foreach.c>
 
 static int test_int_recursion(unsigned int level)
@@ -46,7 +47,7 @@ int main(void)
        int i, j, sum;
        const char *istr, *jstr;
 
-       plan_tests(12);
+       plan_tests(16);
 
        sum = 0;
        foreach_int(i, 0, 1, 2, 3, 4)
@@ -67,12 +68,6 @@ int main(void)
        ok1(sum == 100);
        ok1(count_iters() <= 2);
 
-       sum = test_int_recursion(0);
-       diag("sum = %i\n", sum);
-       diag("iters = %i\n", count_iters());
-       ok1(sum == 160);
-       ok1(count_iters() <= 2 + 5); /* 5 is max depth of recursion. */
-
        sum = 0;
        foreach_ptr(istr, "0", "1", "2", "3", "4")
                foreach_ptr(jstr, "0", "1", "2", "3", "4")
@@ -80,7 +75,7 @@ int main(void)
        diag("sum = %i\n", sum);
        diag("iters = %i\n", count_iters());
        ok1(sum == 100);
-       ok1(count_iters() <= 2 + 5 + 2);
+       ok1(count_iters() <= 2 + 2);
 
        /* Same again... reusing iterators. */
        sum = 0;
@@ -90,13 +85,22 @@ int main(void)
        diag("sum = %i\n", sum);
        diag("iters = %i\n", count_iters());
        ok1(sum == 100);
-       ok1(count_iters() <= 2 + 5 + 2);
+       ok1(count_iters() <= 2 + 2);
 
-       sum = test_ptr_recursion("0");
-       diag("sum = %i\n", sum);
-       diag("iters = %i\n", count_iters());
-       ok1(sum == 160);
-       ok1(count_iters() <= 2 + 5 + 2);
+       /* Do this twice, second time shouldn't increase iterators. */
+       for (i = 0; i < 2; i++) {
+               sum = test_int_recursion(0);
+               diag("sum = %i\n", sum);
+               diag("iters = %i\n", count_iters());
+               ok1(sum == 160);
+               ok1(count_iters() <= 2 + 2 + 5); /* 5 is max depth of recursion. */
+
+               sum = test_ptr_recursion("0");
+               diag("sum = %i\n", sum);
+               diag("iters = %i\n", count_iters());
+               ok1(sum == 160);
+               ok1(count_iters() <= 2 + 2 + 5);
+       }
        return exit_status();
 }