Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5978531b authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf build tests: Elide "-f Makefile" from make invokation 

Since this is the name that 'make' will look for if no explicit -f file
is passed.

This in turn makes the output of 'build-test' more compact:

Before:

  $ perf stat make -C tools/perf build-test
  <SNIP>
  cd . && make FEATURE_DUMP_COPY=/home/acme/git/linux/tools/perf/BUILD_TEST_FEATURE_DUMP feature-dump
          make_no_libaudit_O: cd . && make -f Makefile  O=/tmp/tmp.tHIa0Kkk2Y DESTDIR=/tmp/tmp.foK7rckkVi NO_LIBAUDIT=1 FEATURES_DUMP=/home/acme/git/linux/tools/perf/BUILD_TEST_FEATURE_DUMP
  <SNIP>

After:

  $ perf stat make -C tools/perf build-test
  <SNIP>
          make_no_libaudit_O: cd . && make  O=/tmp/tmp.tHIa0Kkk2Y DESTDIR=/tmp/tmp.foK7rckkVi NO_LIBAUDIT=1 FEATURES_DUMP=/home/acme/git/linux/tools/perf/BUILD_TEST_FEATURE_DUMP
  <SNIP>

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-m440lb8dkfsywsyah0htif6t@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent d3aaf09f

tools/perf/tests/make

+6 −3
Original line number Diff line number Diff line
@@ -111,6 +111,9 @@ run := make_pure 
# disable features detection

ifeq ($(MK),Makefile)

run += make_clean_all

MAKE_F := $(MAKE)

else

MAKE_F := $(MAKE) -f $(MK)

endif

run += make_python_perf_so

run += make_debug
@@ -270,12 +273,12 @@ endif 


MAKEFLAGS := --no-print-directory



clean := @(cd $(PERF); make -s -f $(MK) $(O_OPT) clean >/dev/null)

clean := @(cd $(PERF); $(MAKE_F) -s $(O_OPT) clean >/dev/null)



$(run):

	$(call clean)

	@TMP_DEST=$$(mktemp -d); \

	cmd="cd $(PERF) && make -f $(MK) $(PARALLEL_OPT) $(O_OPT) DESTDIR=$$TMP_DEST $($@)"; \

	cmd="cd $(PERF) && $(MAKE_F) $(PARALLEL_OPT) $(O_OPT) DESTDIR=$$TMP_DEST $($@)"; \

	printf "%*.*s: %s\n" $(max_width) $(max_width) "$@" "$$cmd" && echo $$cmd > $@ && \

	( eval $$cmd ) >> $@ 2>&1; \

	echo "  test: $(call test,$@)" >> $@ 2>&1; \
@@ -286,7 +289,7 @@ $(run_O): 
	$(call clean)

	@TMP_O=$$(mktemp -d); \

	TMP_DEST=$$(mktemp -d); \

	cmd="cd $(PERF) && make -f $(MK) $(PARALLEL_OPT) O=$$TMP_O DESTDIR=$$TMP_DEST $($(patsubst %_O,%,$@))"; \

	cmd="cd $(PERF) && $(MAKE_F) $(PARALLEL_OPT) O=$$TMP_O DESTDIR=$$TMP_DEST $($(patsubst %_O,%,$@))"; \

	printf "%*.*s: %s\n" $(max_width) $(max_width) "$@" "$$cmd" && echo $$cmd > $@ && \

	( eval $$cmd ) >> $@ 2>&1 && \

	echo "  test: $(call test_O,$@)" >> $@ 2>&1; \