X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fgrab_file%2Ftest%2Frun-grab.c;h=060607d54fbd9dcb21fb85a4082dd689a0a82d20;hp=dc25c0b0f32b406f2eb57bad92e8e3ddef1e86e2;hb=c438ec17d7b2efe76e56e5fc5ab88bd4a02735e8;hpb=f0bf01e9e312958f59e0b35f3bf05d9b69581527

diff --git a/ccan/grab_file/test/run-grab.c b/ccan/grab_file/test/run-grab.c
index dc25c0b0..060607d5 100644
--- 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[])
@@ -18,16 +17,19 @@ main(int argc, char *argv[])
 	int 		length;
 	struct 		stat st;
 
-	str = grab_file(NULL, "ccan/grab_file/test/run-grab.c", NULL);
-	split = strsplit(NULL, str, "\n", NULL);
+	str = grab_file(NULL, "test/run-grab.c", NULL);
+	split = strsplit(str, 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 */"));
-	if (stat("ccan/grab_file/test/run-grab.c", &st) != 0) 
-		err(1, "Could not stat self");
+	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) 
+			err(1, "Could not stat self");
 	ok1(st.st_size == length + i);
+	talloc_free(str);
 	
 	return 0;
 }