X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Fccanlint.c;h=01a94758f5916847b2dd9a4c8a86aac89982b75f;hp=51962de8582f9a290b272e95b75cc19347065c51;hb=e0faeb5267ae28751df8fc47740590d0a03592f0;hpb=8d70667887ba081d76075e8959adafb22983b03a diff --git a/tools/ccanlint/ccanlint.c b/tools/ccanlint/ccanlint.c index 51962de8..01a94758 100644 --- a/tools/ccanlint/ccanlint.c +++ b/tools/ccanlint/ccanlint.c @@ -363,24 +363,24 @@ int main(int argc, char *argv[]) cmdline_exclude = btree_new(btree_strcmp); info_exclude = btree_new(btree_strcmp); - opt_register_arg("--dir/-d", opt_set_charp, opt_show_charp, &dir, + opt_register_arg("--dir|-d", opt_set_charp, opt_show_charp, &dir, "use this directory"); - opt_register_noarg("-n/--safe-mode", opt_set_bool, &safe_mode, + opt_register_noarg("-n|--safe-mode", opt_set_bool, &safe_mode, "do not compile anything"); - opt_register_noarg("-l/--list-tests", list_tests, NULL, + opt_register_noarg("-l|--list-tests", list_tests, NULL, "list tests ccanlint performs (and exit)"); - opt_register_arg("-k/--keep ", keep_test, NULL, NULL, + opt_register_arg("-k|--keep ", keep_test, NULL, NULL, "keep results of (can be used multiple times)"); - opt_register_noarg("--summary/-s", opt_set_bool, &summary, + opt_register_noarg("--summary|-s", opt_set_bool, &summary, "simply give one line summary"); - opt_register_noarg("--verbose/-v", opt_inc_intval, &verbose, + opt_register_noarg("--verbose|-v", opt_inc_intval, &verbose, "verbose mode (can specify more than once)"); - opt_register_arg("-x/--exclude ", skip_test, NULL, NULL, + opt_register_arg("-x|--exclude ", skip_test, NULL, NULL, "exclude (can be used multiple times)"); - opt_register_arg("-t/--timeout ", opt_set_uintval, + opt_register_arg("-t|--timeout ", opt_set_uintval, NULL, &timeout, "ignore (terminate) tests that are slower than this"); - opt_register_noarg("-?/-h/--help", opt_usage_and_exit, + opt_register_noarg("-?|-h|--help", opt_usage_and_exit, "\nA program for checking and guiding development" " of CCAN modules.", "This usage message"); @@ -407,12 +407,13 @@ int main(int argc, char *argv[]) talloc_asprintf(m, "%s/test", temp_dir(NULL))) != 0) err(1, "Creating test symlink in %s", temp_dir(NULL)); - /* If you don't pass the compulsory tests, you don't even get a score */ + /* If you don't pass the compulsory tests, you get a score of 0. */ if (verbose) printf("Compulsory tests:\n"); while ((i = get_next_test(&compulsory_tests)) != NULL) { if (!run_test(i, summary, &score, &total_score, m)) { + printf("%sTotal score: 0/%u\n", prefix, total_score); errx(1, "%s%s failed", prefix, i->name); } }