strsplit: remove nump argument

[ccan] / ccan / grab_file / test / run-grab.c

diff --git a/ccan/grab_file/test/run-grab.c b/ccan/grab_file/test/run-grab.c
index 3c44ce055c498e2041209484ad930a7356a2e836..deb466e91d374e120ea9dc812fd96c5cc92cb7b6 100644 (file)
--- a/ccan/grab_file/test/run-grab.c
+++ b/ccan/grab_file/test/run-grab.c
@@ -1,14 +1,13 @@
 /* This is test for grab_file() function
  */
-#include       "grab_file/grab_file.h"
-#include       <stdlib.h>
-#include       <stdio.h>
-#include       <err.h>
-#include       <sys/stat.h>
-#include       "grab_file/grab_file.c"
-#include       "tap/tap.h"
-#include       "str_talloc/str_talloc.h"
-#include       "str/str.h"
+#include <ccan/grab_file/grab_file.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <err.h>
+#include <sys/stat.h>
+#include <ccan/grab_file/grab_file.c>
+#include <ccan/tap/tap.h>
+#include <ccan/str_talloc/str_talloc.h>
 
 int 
 main(int argc, char *argv[])
@@ -19,15 +18,12 @@ main(int argc, char *argv[])
        struct          stat st;
 
        str = grab_file(NULL, "test/run-grab.c", NULL);
-       /* FIXME: run_tests runs us from top level dir.  Kill this */
-       if (!str)
-               str = grab_file(NULL, "ccan/grab_file/test/run-grab.c", NULL);
-       split = strsplit(NULL, str, "\n", NULL);
+       split = strsplit(NULL, str, "\n");
        length = strlen(split[0]);
-       ok1(streq(split[0], "/* This is test for grab_file() function"));
+       ok1(!strcmp(split[0], "/* This is test for grab_file() function"));
        for (i = 1; split[i]; i++)      
                length += strlen(split[i]);
-       ok1(streq(split[i-1], "/* End of grab_file() test */"));
+       ok1(!strcmp(split[i-1], "/* End of grab_file() test */"));
        if (stat("test/run-grab.c", &st) != 0) 
                /* FIXME: ditto */
                if (stat("ccan/grab_file/test/run-grab.c", &st) != 0)