ccanlint: use -t for --target not --timeout

I use --target far more than --timeout.

diff --git a/Makefile b/Makefile
index c73569a5ae77cc4364015cf60a44119848d189de..570793c711aaf7634bf4215dd52eedc8f8420a01 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -94,7 +94,7 @@ check-%: tools/ccanlint/ccanlint
        tools/ccanlint/ccanlint ccan/$*
 
 fastcheck-%: tools/ccanlint/ccanlint
        tools/ccanlint/ccanlint ccan/$*
 
 fastcheck-%: tools/ccanlint/ccanlint

-       tools/ccanlint/ccanlint -t $(FASTTIMEOUT) ccan/$*
+       tools/ccanlint/ccanlint --timeout $(FASTTIMEOUT) ccan/$*

 
 # Doesn't test dependencies, doesn't print verbose fail results.
 summary-check-%: tools/ccanlint/ccanlint $(OBJFILES)
 
 # Doesn't test dependencies, doesn't print verbose fail results.
 summary-check-%: tools/ccanlint/ccanlint $(OBJFILES)

diff --git a/tools/ccanlint/ccanlint.c b/tools/ccanlint/ccanlint.c
index 56191bccf54b62a6fe36e8a7cbe27280ae514d9c..5abcb9e8920ddfd36bc7401031db928bbbfa5fa0 100644 (file)
--- a/tools/ccanlint/ccanlint.c
+++ b/tools/ccanlint/ccanlint.c
@@ -733,10 +733,10 @@ int main(int argc, char *argv[])
                           "simply give one line summary");
        opt_register_arg("-x|--exclude <testname>", exclude_test, NULL, NULL,
                         "exclude <testname> (can be used multiple times)");
                           "simply give one line summary");
        opt_register_arg("-x|--exclude <testname>", exclude_test, NULL, NULL,
                         "exclude <testname> (can be used multiple times)");

-       opt_register_arg("-t|--timeout <milleseconds>", opt_set_uintval,
+       opt_register_arg("--timeout <milleseconds>", opt_set_uintval,

                         NULL, &timeout,
                         "ignore (terminate) tests that are slower than this");
                         NULL, &timeout,
                         "ignore (terminate) tests that are slower than this");

-       opt_register_arg("--target <testname>", opt_set_target, NULL, &all,
+       opt_register_arg("-t|--target <testname>", opt_set_target, NULL, &all,

                         "only run one test (and its prerequisites)");
        opt_register_arg("--compiler <compiler>", opt_set_const_charp,
                         NULL, &compiler, "set the compiler");
                         "only run one test (and its prerequisites)");
        opt_register_arg("--compiler <compiler>", opt_set_const_charp,
                         NULL, &compiler, "set the compiler");