X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fgrab_file%2Ftest%2Frun-grab.c;h=3c44ce055c498e2041209484ad930a7356a2e836;hp=dc25c0b0f32b406f2eb57bad92e8e3ddef1e86e2;hb=f3948bf8102ce5281460e6ed6053150a96d71a91;hpb=f0bf01e9e312958f59e0b35f3bf05d9b69581527;ds=sidebyside

diff --git a/ccan/grab_file/test/run-grab.c b/ccan/grab_file/test/run-grab.c
index dc25c0b0..3c44ce05 100644
--- a/ccan/grab_file/test/run-grab.c
+++ b/ccan/grab_file/test/run-grab.c
@@ -18,15 +18,20 @@ main(int argc, char *argv[])
 	int 		length;
 	struct 		stat st;
 
-	str = grab_file(NULL, "ccan/grab_file/test/run-grab.c", NULL);
+	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);
 	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/grab_file/test/run-grab.c", &st) != 0) 
-		err(1, "Could not stat self");
+	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);
 	
 	return 0;