X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Ftest%2Frun-file_analysis.c;h=e989fd25acff85f6335770b05f9b6e499ec97680;hb=d872b7f22bc98092cad2aa4a456973bdbdb2c8fb;hp=b52d19df5e6954140b5fc8b90fc0b508bd0403e7;hpb=08f8cff8f22fee31b74f8301cc5d6494e5ff7160;p=ccan

diff --git a/tools/ccanlint/test/run-file_analysis.c b/tools/ccanlint/test/run-file_analysis.c
index b52d19df..e989fd25 100644
--- a/tools/ccanlint/test/run-file_analysis.c
+++ b/tools/ccanlint/test/run-file_analysis.c
@@ -98,15 +98,15 @@ int main(int argc, char *argv[])
 {
 	unsigned int i;
 	struct line_info *line_info;
-	struct ccan_file *f = talloc(NULL, struct ccan_file);
+	struct ccan_file *f = tal(NULL, struct ccan_file);
 
-	plan_tests(NUM_LINES * 2 + 2 + 66);
+	plan_tests(NUM_LINES * 2 + 2 + 86);
 
 	f->num_lines = NUM_LINES;
 	f->line_info = NULL;
-	f->lines = talloc_array(f, char *, f->num_lines);
+	f->lines = tal_array(f, char *, f->num_lines);
 	for (i = 0; i < f->num_lines; i++)
-		f->lines[i] = talloc_strdup(f->lines, testfile[i].line);
+		f->lines[i] = tal_strdup(f->lines, testfile[i].line);
 	
 	line_info = get_ccan_line_info(f);
 	ok1(line_info == f->line_info);
@@ -176,26 +176,55 @@ int main(int argc, char *argv[])
 
 	/* Now check using interface. */
 	for (i = 0; i < f->num_lines; i++) {
+		unsigned int val = 1;
 		if (streq(testfile[i].line, "BAR")) {
-			ok1(get_ccan_line_pp(line_info[i].cond, "BAR", 1)
-			    == COMPILED);
-			ok1(get_ccan_line_pp(line_info[i].cond, "FOO", 1)
-			    == NOT_COMPILED);
+			/* If we don't know if the TEST_H was undefined,
+			 * best we get is a MAYBE. */
+			ok1(get_ccan_line_pp(line_info[i].cond, "BAR", &val,
+					     NULL) == MAYBE_COMPILED);
+			ok1(get_ccan_line_pp(line_info[i].cond, "BAR", NULL,
+					     NULL) == NOT_COMPILED);
+			ok1(get_ccan_line_pp(line_info[i].cond, "BAR", &val,
+					     "TEST_H", NULL,
+					     NULL) == COMPILED);
+			ok1(get_ccan_line_pp(line_info[i].cond, "BAR", NULL,
+					     "TEST_H", NULL,
+					     NULL) == NOT_COMPILED);
 		} else if (streq(testfile[i].line, "!BAR")) {
-			ok1(get_ccan_line_pp(line_info[i].cond, "BAR", 1)
-			    == NOT_COMPILED);
-			ok1(get_ccan_line_pp(line_info[i].cond, "FOO", 1)
-			    == COMPILED);
+			ok1(get_ccan_line_pp(line_info[i].cond, "BAR", &val,
+					     NULL) == NOT_COMPILED);
+			ok1(get_ccan_line_pp(line_info[i].cond, "BAR", NULL,
+					     NULL) == MAYBE_COMPILED);
+			ok1(get_ccan_line_pp(line_info[i].cond, "BAR", &val,
+					     "TEST_H", NULL,
+					     NULL) == NOT_COMPILED);
+			ok1(get_ccan_line_pp(line_info[i].cond, "BAR", NULL,
+					     "TEST_H", NULL,
+					     NULL) == COMPILED);
 		} else if (streq(testfile[i].line, "HAVE_BAR")) {
-			ok1(get_ccan_line_pp(line_info[i].cond, "HAVE_BAR", 1)
-			    == COMPILED);
-			ok1(get_ccan_line_pp(line_info[i].cond, "HAVE_BAR", 0)
-			    == NOT_COMPILED);
+			ok1(get_ccan_line_pp(line_info[i].cond, "HAVE_BAR",
+					     &val, NULL) == MAYBE_COMPILED);
+			ok1(get_ccan_line_pp(line_info[i].cond, "HAVE_BAR",
+					     &val, "TEST_H", NULL,
+					     NULL) == COMPILED);
+			val = 0;
+			ok1(get_ccan_line_pp(line_info[i].cond, "HAVE_BAR",
+					     &val, NULL) == NOT_COMPILED);
+			ok1(get_ccan_line_pp(line_info[i].cond, "HAVE_BAR",
+					     &val, "TEST_H", NULL,
+					     NULL) == NOT_COMPILED);
 		} else if (streq(testfile[i].line, "HAVE_FOO")) {
-			ok1(get_ccan_line_pp(line_info[i].cond, "HAVE_FOO", 1)
-			    == COMPILED);
-			ok1(get_ccan_line_pp(line_info[i].cond, "HAVE_FOO", 0)
-			    == NOT_COMPILED);
+			ok1(get_ccan_line_pp(line_info[i].cond, "HAVE_FOO",
+					     &val, NULL) == MAYBE_COMPILED);
+			ok1(get_ccan_line_pp(line_info[i].cond, "HAVE_FOO",
+					     &val, "TEST_H", NULL,
+					     NULL) == COMPILED);
+			val = 0;
+			ok1(get_ccan_line_pp(line_info[i].cond, "HAVE_FOO",
+					     &val, NULL) == NOT_COMPILED);
+			ok1(get_ccan_line_pp(line_info[i].cond, "HAVE_FOO",
+					     &val, "TEST_H", NULL,
+					     NULL) == NOT_COMPILED);
 		}
 	}