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

diff --git a/ccan/grab_file/test/run-grab.c b/ccan/grab_file/test/run-grab.c
index b3c18e5a..060607d5 100644
--- a/ccan/grab_file/test/run-grab.c
+++ b/ccan/grab_file/test/run-grab.c
@@ -8,7 +8,6 @@
 #include <ccan/grab_file/grab_file.c>
 #include <ccan/tap/tap.h>
 #include <ccan/str_talloc/str_talloc.h>
-#include <ccan/str/str.h>
 
 int 
 main(int argc, char *argv[])
@@ -19,20 +18,18 @@ 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(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 */"));
+	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;
 }