From cbfd7dab2db253b98960208af65b9e3cb734abcd Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Wed, 23 Jul 2014 17:31:31 +1000 Subject: [PATCH] selftests/powerpc: Don't ignore errors from sub Makefiles Currently we ignore errors from our sub Makefiles. We inherited that from the top-level selftests Makefile which aims to build and run as many tests as possible and damn the torpedoes. For the powerpc tests we'd instead like any errors to fail the build, so we can automatically catch build failures. We can achieve the best of both worlds by using -k, which tells make to keep building when it hits an error, but still reports the error. Signed-off-by: Michael Ellerman Signed-off-by: Benjamin Herrenschmidt --- tools/testing/selftests/powerpc/Makefile | 10 +++++----- tools/testing/selftests/powerpc/pmu/Makefile | 15 ++++++--------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/tools/testing/selftests/powerpc/Makefile b/tools/testing/selftests/powerpc/Makefile index 54833a791a44..74a78cedce37 100644 --- a/tools/testing/selftests/powerpc/Makefile +++ b/tools/testing/selftests/powerpc/Makefile @@ -17,10 +17,10 @@ TARGETS = pmu copyloops mm tm endif -all: - @for TARGET in $(TARGETS); do \ - $(MAKE) -C $$TARGET all; \ - done; +all: $(TARGETS) + +$(TARGETS): + $(MAKE) -k -C $@ all run_tests: all @for TARGET in $(TARGETS); do \ @@ -36,4 +36,4 @@ clean: tags: find . -name '*.c' -o -name '*.h' | xargs ctags -.PHONY: all run_tests clean tags +.PHONY: all run_tests clean tags $(TARGETS) diff --git a/tools/testing/selftests/powerpc/pmu/Makefile b/tools/testing/selftests/powerpc/pmu/Makefile index b9ff0db42c79..cd256277c24e 100644 --- a/tools/testing/selftests/powerpc/pmu/Makefile +++ b/tools/testing/selftests/powerpc/pmu/Makefile @@ -4,7 +4,9 @@ noarg: PROGS := count_instructions EXTRA_SOURCES := ../harness.c event.c -all: $(PROGS) sub_all +SUB_TARGETS = ebb + +all: $(PROGS) $(SUB_TARGETS) $(PROGS): $(EXTRA_SOURCES) @@ -20,13 +22,8 @@ run_tests: all sub_run_tests clean: sub_clean rm -f $(PROGS) loop.o - -SUB_TARGETS = ebb - -sub_all: - @for TARGET in $(SUB_TARGETS); do \ - $(MAKE) -C $$TARGET all; \ - done; +$(SUB_TARGETS): + $(MAKE) -k -C $@ all sub_run_tests: all @for TARGET in $(SUB_TARGETS); do \ @@ -38,4 +35,4 @@ sub_clean: $(MAKE) -C $$TARGET clean; \ done; -.PHONY: all run_tests clean sub_all sub_run_tests sub_clean +.PHONY: all run_tests clean sub_run_tests sub_clean $(SUB_TARGETS) -- 2.30.2