Fix sequence logic bug, and satisfies() logic fix/cleanup.

[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 2b36a0fb70d77ba03b59ae83cb64ab66e6acb56b..dc25c0b0f32b406f2eb57bad92e8e3ddef1e86e2 100644 (file)
--- a/ccan/grab_file/test/run-grab.c
+++ b/ccan/grab_file/test/run-grab.c
@@ -1,13 +1,14 @@
 /* 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       "string/string.h"
-#include       "string/string.c"
+#include       "grab_file/grab_file.c"
 #include       "tap/tap.h"
+#include       "str_talloc/str_talloc.h"
+#include       "str/str.h"
 
 int 
 main(int argc, char *argv[])
@@ -17,14 +18,14 @@ main(int argc, char *argv[])
        int             length;
        struct          stat st;
 
-       str = grab_file(NULL, "ccan/string/test/run-grab.c", NULL);
+       str = grab_file(NULL, "ccan/grab_file/test/run-grab.c", NULL);
        split = strsplit(NULL, str, "\n", NULL);
        length = strlen(split[0]);
        ok1(streq(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 */"));
-       if (stat("ccan/string/test/run-grab.c", &st) != 0) 
+       if (stat("ccan/grab_file/test/run-grab.c", &st) != 0) 
                err(1, "Could not stat self");
        ok1(st.st_size == length + i);