From: Rusty Russell <rusty@rustcorp.com.au>
Date: Mon, 8 Nov 2010 22:20:21 +0000 (+1030)
Subject: ccanlint: fix up creation of test/run.c
X-Git-Url: https://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=71c95e84ac622186f7e0ba0c0e7780c5acbc185e

ccanlint: fix up creation of test/run.c

Make test directory correctly, and #include <ccan/...> not #include "".
---

diff --git a/tools/ccanlint/tests/has_tests.c b/tools/ccanlint/tests/has_tests.c
index 56eaf2a4..42375400 100644
--- a/tools/ccanlint/tests/has_tests.c
+++ b/tools/ccanlint/tests/has_tests.c
@@ -77,6 +77,7 @@ static void handle_no_tests(struct manifest *m, void *check_result)
 {
 	FILE *run;
 	struct ccan_file *i;
+	char *test_dir = talloc_asprintf(m, "%s/test", m->dir);
 
 	if (check_result == test_is_not_dir)
 		return;
@@ -84,7 +85,7 @@ static void handle_no_tests(struct manifest *m, void *check_result)
 	if (!ask("Should I create a template test/run.c file for you?"))
 		return;
 
-	if (mkdir("test", 0700) != 0) {
+	if (mkdir(test_dir, 0700) != 0) {
 		if (errno != EEXIST)
 			err(1, "Creating test/ directory");
 	}
@@ -93,12 +94,14 @@ static void handle_no_tests(struct manifest *m, void *check_result)
 	if (!run)
 		err(1, "Trying to create a test/run.c");
 
-	fputs("/* Include the main header first, to test it works */\n", run);
-	fprintf(run, "#include \"%s/%s.h\"\n", m->basename, m->basename);
-	fputs("/* Include the C files directly. */\n", run);
-	list_for_each(&m->c_files, i, list)
-		fprintf(run, "#include \"%s/%s\"\n", m->basename, i->name);
-	fputs("#include \"tap/tap.h\"\n", run);
+	fprintf(run, "#include <ccan/%s/%s.h>\n", m->basename, m->basename);
+	if (!list_empty(&m->c_files)) {
+		fputs("/* Include the C files directly. */\n", run);
+		list_for_each(&m->c_files, i, list)
+			fprintf(run, "#include <ccan/%s/%s>\n",
+				m->basename, i->name);
+	}
+	fputs("#include <ccan/tap/tap.h>\n", run);
 	fputs("\n", run);
 
 	fputs("int main(void)\n", run);