From 38b07a7f325a8e6b43e61833f4e55c89c27065ba Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 6 Jan 2010 12:57:16 +1030 Subject: [PATCH 1/1] Fix tests: path change because they're now run under ccanlint (from their dir) --- ccan/ccan_tokenizer/test/run.c | 2 +- ccan/ciniparser/test/run.c | 2 +- ccan/grab_file/test/run-grab.c | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ccan/ccan_tokenizer/test/run.c b/ccan/ccan_tokenizer/test/run.c index 631518aa..8b16fe08 100644 --- 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:; } - 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); diff --git a/ccan/ciniparser/test/run.c b/ccan/ciniparser/test/run.c index 5fe67b46..d918148b 100644 --- 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) - ini_name = "ccan/ciniparser/test/test.ini"; + ini_name = "test/test.ini"; else ini_name = argv[1] ; diff --git a/ccan/grab_file/test/run-grab.c b/ccan/grab_file/test/run-grab.c index b3c18e5a..baaf5066 100644 --- 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); - /* 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")); -- 2.39.2