X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Fcompulsory_tests%2Fbuild_objs.c;h=9393f62f11eb4507dc3ca76330e279a03fb136c8;hp=6899b7b04986e5418e03f20e861a9435b3cea413;hb=f9423c171395571f9880286190d9cf63da147668;hpb=fb4c4c3ddc24772f71a64ec02d2c9ddaeb6e9f6b

diff --git a/tools/ccanlint/compulsory_tests/build_objs.c b/tools/ccanlint/compulsory_tests/build_objs.c
index 6899b7b0..9393f62f 100644
--- a/tools/ccanlint/compulsory_tests/build_objs.c
+++ b/tools/ccanlint/compulsory_tests/build_objs.c
@@ -21,42 +21,46 @@ static const char *can_build(struct manifest *m)
 	return NULL;
 }
 
-static void *check_objs_build(struct manifest *m,
-			      bool keep, unsigned int *timeleft)
+static void check_objs_build(struct manifest *m,
+			     bool keep,
+			     unsigned int *timeleft, struct score *score)
 {
-	char *report = NULL;
 	struct ccan_file *i;
+	bool errors = false, warnings = false;
+
+	if (list_empty(&m->c_files))
+		score->total = 0;
+	else
+		score->total = 2;
 
 	list_for_each(&m->c_files, i, list) {
-		char *err;
+		char *output;
 		char *fullfile = talloc_asprintf(m, "%s/%s", m->dir, i->name);
 
-		/* One point for each obj file. */
-		build_objs.total_score++;
-
 		i->compiled = maybe_temp_file(m, "", keep, fullfile);
-		err = compile_object(m, fullfile, ccan_dir, i->compiled);
-		if (err) {
+		if (!compile_object(score, fullfile, ccan_dir, "", i->compiled,
+				    &output)) {
 			talloc_free(i->compiled);
-			if (report)
-				report = talloc_append_string(report, err);
-			else
-				report = err;
+			score->error = "Compiling object files";
+			score_file_error(score, i, 0, output);
+			errors = true;
+		} else if (!streq(output, "")) {
+			score->error = "Compiling object files gave warnings";
+			score_file_error(score, i, 0, output);
+			warnings = true;
 		}
 	}
-	return report;
-}
 
-static const char *describe_objs_build(struct manifest *m, void *check_result)
-{
-	return check_result;
+	if (!errors) {
+		score->pass = true;
+		score->score = score->total - warnings;
+	}
 }
 
 struct ccanlint build_objs = {
-	.key = "build-objects",
+	.key = "objects_build",
 	.name = "Module object files can be built",
 	.check = check_objs_build,
-	.describe = describe_objs_build,
 	.can_run = can_build,
 };