Fix tests: path change because they're now run under ccanlint (from their dir)

diff --git a/ccan/ccan_tokenizer/test/run.c b/ccan/ccan_tokenizer/test/run.c
index 631518aa49b8219aae273b5f6bad8ea8519c5e7f..8b16fe084c3fd87b95ab375e89c8f2f23a02bdcc 100644 (file)
--- a/ccan/ccan_tokenizer/test/run.c
+++ b/ccan/ccan_tokenizer/test/run.c
@@ -1411,7 +1411,7 @@ static void test_tokenizer(void) {
        msg_fail:;
        }
        
        msg_fail:;
        }
        

-       test_tokenizer_file("ccan/ccan_tokenizer/test/run.c", &mq);
+       test_tokenizer_file("test/run.c", &mq);

        
        while (queue_count(mq)) {
                struct tok_message msg = dequeue(mq);
        
        while (queue_count(mq)) {
                struct tok_message msg = dequeue(mq);

diff --git a/ccan/ciniparser/test/run.c b/ccan/ciniparser/test/run.c
index 5fe67b467010aee2655532ca13e4b1c1312d62b7..d918148b930a0d5d508a99796b2b5fd9b95d92ed 100644 (file)
--- a/ccan/ciniparser/test/run.c
+++ b/ccan/ciniparser/test/run.c
@@ -22,7 +22,7 @@ int main(int argc, char * argv[])
        double dtmp;
 
        if (argc < 2)
        double dtmp;
 
        if (argc < 2)

-               ini_name = "ccan/ciniparser/test/test.ini";
+               ini_name = "test/test.ini";

        else
                ini_name = argv[1] ;
 
        else
                ini_name = argv[1] ;
 

diff --git a/ccan/grab_file/test/run-grab.c b/ccan/grab_file/test/run-grab.c
index b3c18e5a4db20369c42096c00734b1e4ce098a9c..baaf506642134aafe1de920c830c4ab288db2640 100644 (file)
--- a/ccan/grab_file/test/run-grab.c
+++ b/ccan/grab_file/test/run-grab.c
@@ -19,9 +19,6 @@ main(int argc, char *argv[])
        struct          stat st;
 
        str = grab_file(NULL, "test/run-grab.c", NULL);
        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);
        length = strlen(split[0]);
        ok1(streq(split[0], "/* This is test for grab_file() function"));
        split = strsplit(NULL, str, "\n", NULL);
        length = strlen(split[0]);
        ok1(streq(split[0], "/* This is test for grab_file() function"));