|
@@ -5,7 +5,7 @@ ifeq ($(MAKECMDGOALS),)
|
|
|
# no target specified, trigger the whole suite
|
|
|
all:
|
|
|
@echo "Testing Makefile"; $(MAKE) -sf tests/make MK=Makefile
|
|
|
- @echo "Testing Makefile.perf"; $(MAKE) -sf tests/make MK=Makefile.perf
|
|
|
+ @echo "Testing Makefile.perf"; $(MAKE) -sf tests/make MK=Makefile.perf SET_PARALLEL=1
|
|
|
else
|
|
|
# run only specific test over 'Makefile'
|
|
|
%:
|
|
@@ -14,6 +14,15 @@ endif
|
|
|
else
|
|
|
PERF := .
|
|
|
|
|
|
+PARALLEL_OPT=
|
|
|
+ifeq ($(SET_PARALLEL),1)
|
|
|
+ cores := $(shell (getconf _NPROCESSORS_ONLN || egrep -c '^processor|^CPU[0-9]' /proc/cpuinfo) 2>/dev/null)
|
|
|
+ ifeq ($(cores),0)
|
|
|
+ cores := 1
|
|
|
+ endif
|
|
|
+ PARALLEL_OPT="-j$(cores)"
|
|
|
+endif
|
|
|
+
|
|
|
# As per kernel Makefile, avoid funny character set dependencies
|
|
|
unexport LC_ALL
|
|
|
LC_COLLATE=C
|
|
@@ -252,7 +261,7 @@ clean := @(cd $(PERF); make -s -f $(MK) clean >/dev/null)
|
|
|
$(run):
|
|
|
$(call clean)
|
|
|
@TMP_DEST=$$(mktemp -d); \
|
|
|
- cmd="cd $(PERF) && make -f $(MK) DESTDIR=$$TMP_DEST $($@)"; \
|
|
|
+ cmd="cd $(PERF) && make -f $(MK) $(PARALLEL_OPT) DESTDIR=$$TMP_DEST $($@)"; \
|
|
|
echo "- $@: $$cmd" && echo $$cmd > $@ && \
|
|
|
( eval $$cmd ) >> $@ 2>&1; \
|
|
|
echo " test: $(call test,$@)" >> $@ 2>&1; \
|
|
@@ -263,7 +272,7 @@ $(run_O):
|
|
|
$(call clean)
|
|
|
@TMP_O=$$(mktemp -d); \
|
|
|
TMP_DEST=$$(mktemp -d); \
|
|
|
- cmd="cd $(PERF) && make -f $(MK) O=$$TMP_O DESTDIR=$$TMP_DEST $($(patsubst %_O,%,$@))"; \
|
|
|
+ cmd="cd $(PERF) && make -f $(MK) $(PARALLEL_OPT) O=$$TMP_O DESTDIR=$$TMP_DEST $($(patsubst %_O,%,$@))"; \
|
|
|
echo "- $@: $$cmd" && echo $$cmd > $@ && \
|
|
|
( eval $$cmd ) >> $@ 2>&1 && \
|
|
|
echo " test: $(call test_O,$@)" >> $@ 2>&1; \
|
|
@@ -277,15 +286,15 @@ tarpkg:
|
|
|
rm -f $@
|
|
|
|
|
|
make_kernelsrc:
|
|
|
- @echo "- make -C <kernelsrc> tools/perf"
|
|
|
+ @echo "- make -C <kernelsrc> $(PARALLEL_OPT) tools/perf"
|
|
|
$(call clean); \
|
|
|
- (make -C ../.. tools/perf) > $@ 2>&1 && \
|
|
|
+ (make -C ../.. $(PARALLEL_OPT) tools/perf) > $@ 2>&1 && \
|
|
|
test -x perf && rm -f $@ || (cat $@ ; false)
|
|
|
|
|
|
make_kernelsrc_tools:
|
|
|
- @echo "- make -C <kernelsrc>/tools perf"
|
|
|
+ @echo "- make -C <kernelsrc>/tools $(PARALLEL_OPT) perf"
|
|
|
$(call clean); \
|
|
|
- (make -C ../../tools perf) > $@ 2>&1 && \
|
|
|
+ (make -C ../../tools $(PARALLEL_OPT) perf) > $@ 2>&1 && \
|
|
|
test -x perf && rm -f $@ || (cat $@ ; false)
|
|
|
|
|
|
all: $(run) $(run_O) tarpkg make_kernelsrc make_kernelsrc_tools
|