str: clean up tests so ccanlint doesn't complain about memory leaking.

[ccan] / ccan / str / test / run.c

diff --git a/ccan/str/test/run.c b/ccan/str/test/run.c
index 20711ad0c0ea29fccd2ec9f20940fe935e8a4793..4648692be655165413d5cc250844df35f4553ccb 100644 (file)
--- a/ccan/str/test/run.c
+++ b/ccan/str/test/run.c
@@ -1,8 +1,7 @@
-#include "string/string.h"
+#include <ccan/str/str.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "string/string.c"
-#include "tap/tap.h"
+#include <ccan/tap/tap.h>
 
 /* FIXME: ccanize */
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
@@ -24,8 +23,6 @@ static char *strdup_rev(const char *s)
 int main(int argc, char *argv[])
 {
        unsigned int i, j, n;
-       char **split, *str;
-       void *ctx;
        char *strings[NUM_SUBSTRINGS * NUM_SUBSTRINGS];
        
        n = 0;
@@ -38,7 +35,7 @@ int main(int argc, char *argv[])
                }
        }
 
-       plan_tests(n * n * 5);
+       plan_tests(n * n * 5 + 3);
        for (i = 0; i < n; i++) {
                for (j = 0; j < n; j++) {
                        unsigned int k, identical = 0;
@@ -76,8 +73,19 @@ int main(int argc, char *argv[])
                                ok1(!strstarts(strings[i], strings[j]));
                                ok1(!strends(reva, revb));
                        }
+                       free(reva);
+                       free(revb);
                }
        }
 
+       for (i = 0; i < n; i++)
+               free(strings[i]);
+
+       ok1(streq(stringify(NUM_SUBSTRINGS),
+                 "((sizeof(substrings) / sizeof(substrings[0])) - 1)"));
+       ok1(streq(stringify(ARRAY_SIZE(substrings)),
+                 "(sizeof(substrings) / sizeof(substrings[0]))"));
+       ok1(streq(stringify(i == 0), "i == 0"));
+
        return exit_status();
 }