Re: [PATCH 5/8] tools build: Allow setting the feature detection user

[Jiri Olsa <jolsa@redhat.com>]

On Mon, Sep 21, 2015 at 06:23:18PM -0300, Arnaldo Carvalho de Melo wrote:
> From: Arnaldo Carvalho de Melo <acme@redhat.com>
> 
> We will use the tools/build/ autodetection in the eBPF patchkit
> and it is currently sharing the output directory with perf, that
> also uses the feature detection logic.
> 
> As se keep state in the output directory, so that we can avoid running
> all the tests again, we need to have different filenames for the files
> used in this state, allow doing that via the FEATURE_USER variable,
> to be set alongside the existing FEATURE_{TEST,DISPLAY} variables.
> 
> Acked-by: Jiri Olsa <jolsa@kernel.org>
> Cc: Alexei Starovoitov <ast@plumgrid.com>
> Cc: Adrian Hunter <adrian.hunter@intel.com>
> Cc: Borislav Petkov <bp@suse.de>
> Cc: David Ahern <dsahern@gmail.com>
> Cc: Frederic Weisbecker <fweisbec@gmail.com>
> Cc: Namhyung Kim <namhyung@kernel.org>
> Cc: Stephane Eranian <eranian@google.com>
> Cc: Wang Nan <wangnan0@huawei.com>
> Cc: pi3orama@163.com
> Link: http://lkml.kernel.org/n/tip-qzkc56xurvxwppvc1p0qdw3t@git.kernel.org
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> ---
>  tools/build/Makefile.feature | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature
> index 690d5614edd4..5365d0fefadb 100644
> --- a/tools/build/Makefile.feature
> +++ b/tools/build/Makefile.feature
> @@ -121,8 +121,9 @@ define feature_print_text_code
>      MSG = $(shell printf '...%30s: %s' $(1) $(2))
>  endef
>  
> +FEATURE_DUMP_FILENAME = $(OUTPUT)FEATURE-DUMP$(FEATURE_USER)
>  FEATURE_DUMP := $(foreach feat,$(FEATURE_DISPLAY),feature-$(feat)($(feature-$(feat))))
> -FEATURE_DUMP_FILE := $(shell touch $(OUTPUT)FEATURE-DUMP; cat $(OUTPUT)FEATURE-DUMP)
> +FEATURE_DUMP_FILE := $(shell touch $(FEATURE_DUMP_FILENAME); cat $(FEATURE_DUMP_FILENAME))
>  
>  ifeq ($(dwarf-post-unwind),1)
>    FEATURE_DUMP += dwarf-post-unwind($(dwarf-post-unwind-text))
> @@ -136,7 +137,7 @@ endif
>  # - VF is enabled
>  
>  ifneq ("$(FEATURE_DUMP)","$(FEATURE_DUMP_FILE)")
> -  $(shell echo "$(FEATURE_DUMP)" > $(OUTPUT)FEATURE-DUMP)
> +  $(shell echo "$(FEATURE_DUMP)" > $(FEATURE_DUMP_FILENAME))
>    feature_display := 1
>  endif

one nit ;-) 

jirka


---
diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature
index 5365d0fefadb..b37101207cbd 100644
--- a/tools/build/Makefile.feature
+++ b/tools/build/Makefile.feature
@@ -132,7 +132,7 @@ endif
 # The $(feature_display) controls the default detection message
 # output. It's set if:
 # - detected features differes from stored features from
-#   last build (in FEATURE-DUMP file)
+#   last build (in FEATURE-DUMP$(FEATURE_USER) file)
 # - one of the $(FEATURE_DISPLAY) is not detected
 # - VF is enabled