From: Rusty Russell Date: Thu, 22 Nov 2012 00:32:17 +0000 (+1030) Subject: Makefile: remove FASTTIMEOUT X-Git-Url: http://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=a64257be339a8485f66ca9bafd6be7077aa873cd Makefile: remove FASTTIMEOUT Far more effective to just skip valgrind and gcov if you want fast results; that's what we do for the summary already. Signed-off-by: Rusty Russell --- diff --git a/Makefile b/Makefile index c50894d7..b3553156 100644 --- a/Makefile +++ b/Makefile @@ -13,45 +13,6 @@ # Where make scores puts the results SCOREDIR=scores/$(shell whoami)/$(shell uname -s)-$(shell uname -m)-$(CC)-$(shell git describe --always --dirty) -# Here's my rough logarithmic timeout graph for my laptop: -# -# 302 - -# | / --* -# | / -# | / -# | / -# |Execution Time, seconds / -# | / -# | ---// -# | / -# | // -# | ---\ --- -# | --- \\ ------ -# |----------------- \--- -# 19 +------------------------------------------------------+-- -# 0 Timeout (ms, logarithmic) 262144 -# -# 140 -# | -# |------------ -# | --- -# | --------- -# | ------- -# | --\ -# | \\- -# | Tests skipped --\ -# | \ -# | \\ -# | \\\ -# | \ -# | \---- -# --+0---------------------------------------------------==+-- -# 0 Timeout (ms, logarithmic) 262144 -# -# On my laptop, this runs 574 tests in 40 seconds, vs. a full check which -# runs 676 tests in 260 seconds. -FASTTIMEOUT=750 - default: libccan.a ALL_DEPENDS=$(patsubst %, ccan/%/.depends, $(MODS_NORMAL) $(MODS_EXTERNAL)) @@ -85,7 +46,7 @@ check-%: tools/ccanlint/ccanlint tools/ccanlint/ccanlint ccan/$* fastcheck-%: tools/ccanlint/ccanlint - tools/ccanlint/ccanlint --timeout $(FASTTIMEOUT) ccan/$* + tools/ccanlint/ccanlint -x tests_pass_valgrind -x tests_compile_coverage ccan/$* # Doesn't test dependencies, doesn't print verbose fail results. summary-check-%: tools/ccanlint/ccanlint $(OBJFILES)