str: fix warnings.

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

diff --git a/ccan/str/test/run.c b/ccan/str/test/run.c
index 4648692be655165413d5cc250844df35f4553ccb..0f00ea320d2a67fbc8c65448f14017abbdb1a165 100644 (file)
--- a/ccan/str/test/run.c
+++ b/ccan/str/test/run.c
@@ -1,12 +1,13 @@
 #include <ccan/str/str.h>
+#include <ccan/str/str.c>
 #include <stdlib.h>
 #include <stdio.h>
 #include <ccan/tap/tap.h>
 
-/* FIXME: ccanize */
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
 
-static char *substrings[] = { "far", "bar", "baz", "b", "ba", "z", "ar", NULL };
+static const char *substrings[] = { "far", "bar", "baz", "b", "ba", "z", "ar",
+                                   NULL };
 
 #define NUM_SUBSTRINGS (ARRAY_SIZE(substrings) - 1)
 
@@ -35,7 +36,7 @@ int main(int argc, char *argv[])
                }
        }
 
-       plan_tests(n * n * 5 + 3);
+       plan_tests(n * n * 5 + 16);
        for (i = 0; i < n; i++) {
                for (j = 0; j < n; j++) {
                        unsigned int k, identical = 0;
@@ -87,5 +88,19 @@ int main(int argc, char *argv[])
                  "(sizeof(substrings) / sizeof(substrings[0]))"));
        ok1(streq(stringify(i == 0), "i == 0"));
 
+       ok1(strcount("aaaaaa", "b") == 0);
+       ok1(strcount("aaaaaa", "a") == 6);
+       ok1(strcount("aaaaaa", "aa") == 3);
+       ok1(strcount("aaaaaa", "aaa") == 2);
+       ok1(strcount("aaaaaa", "aaaa") == 1);
+       ok1(strcount("aaaaaa", "aaaaa") == 1);
+       ok1(strcount("aaaaaa", "aaaaaa") == 1);
+       ok1(strcount("aaa aaa", "b") == 0);
+       ok1(strcount("aaa aaa", "a") == 6);
+       ok1(strcount("aaa aaa", "aa") == 2);
+       ok1(strcount("aaa aaa", "aaa") == 2);
+       ok1(strcount("aaa aaa", "aaaa") == 0);
+       ok1(strcount("aaa aaa", "aaaaa") == 0);
+
        return exit_status();
 }