Browse Source

ccanlint: clarify different -v levels.

Rusty Russell 15 years ago
parent
commit
13c2e75f28
2 changed files with 11 additions and 6 deletions
  1. 4 3
      tools/ccanlint/ccanlint.c
  2. 7 3
      tools/ccanlint/ccanlint.h

+ 4 - 3
tools/ccanlint/ccanlint.c

@@ -1,6 +1,7 @@
 /*
 /*
  * ccanlint: assorted checks and advice for a ccan package
  * ccanlint: assorted checks and advice for a ccan package
  * Copyright (C) 2008 Rusty Russell, Idris Soule
  * Copyright (C) 2008 Rusty Russell, Idris Soule
+ * Copyright (C) 2010 Rusty Russell, Idris Soule
  *
  *
  * This program is free software; you can redistribute it and/or modify it
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
  * under the terms of the GNU General Public License as published by the Free
@@ -409,7 +410,7 @@ int main(int argc, char *argv[])
 	opt_register_noarg("--summary|-s", opt_set_bool, &summary,
 	opt_register_noarg("--summary|-s", opt_set_bool, &summary,
 			   "simply give one line 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)");
+			   "verbose mode (up to -vvvv)");
 	opt_register_arg("-x|--exclude <testname>", skip_test, NULL, NULL,
 	opt_register_arg("-x|--exclude <testname>", skip_test, NULL, NULL,
 			 "exclude <testname> (can be used multiple times)");
 			 "exclude <testname> (can be used multiple times)");
 	opt_register_arg("-t|--timeout <milleseconds>", opt_set_uintval,
 	opt_register_arg("-t|--timeout <milleseconds>", opt_set_uintval,
@@ -429,9 +430,9 @@ int main(int argc, char *argv[])
 		dir = talloc_asprintf_append(NULL, "%s/%s", base_dir, dir);
 		dir = talloc_asprintf_append(NULL, "%s/%s", base_dir, dir);
 	if (dir != base_dir)
 	if (dir != base_dir)
 		prefix = talloc_append_string(talloc_basename(NULL, dir), ": ");
 		prefix = talloc_append_string(talloc_basename(NULL, dir), ": ");
-	if (verbose >= 2)
-		compile_verbose = true;
 	if (verbose >= 3)
 	if (verbose >= 3)
+		compile_verbose = true;
+	if (verbose >= 4)
 		tools_verbose = true;
 		tools_verbose = true;
 
 
 	/* We move into temporary directory, so gcov dumps its files there. */
 	/* We move into temporary directory, so gcov dumps its files there. */

+ 7 - 3
tools/ccanlint/ccanlint.h

@@ -11,9 +11,13 @@
 
 
 #define REGISTER_TEST(name, ...) 
 #define REGISTER_TEST(name, ...) 
 
 
-/* 1 == Describe results for partial failures.
-   2 == Describe gory details.
-   3 == Describe every action. */
+/* 0 == Describe failed tests.
+   1 == Describe results for partial failures.
+   2 == One line per test, plus details of failures.
+
+   Mainly for debugging ccanlint:
+   3 == Describe every object built.
+   4 == Describe every action. */
 extern int verbose;
 extern int verbose;
 
 
 struct manifest {
 struct manifest {