From mboxrd@z Thu Jan 1 00:00:00 1970 From: Petr Vorel Subject: [PATCH iproute2 v2 1/3] testsuite: Fix missing generate_nlmsg Date: Thu, 20 Sep 2018 01:36:22 +0200 Message-ID: <20180919233624.18494-2-petr.vorel@gmail.com> References: <20180919233624.18494-1-petr.vorel@gmail.com> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Cc: Petr Vorel , Stephen Hemminger , Phil Sutter , Luca Boccassi To: netdev@vger.kernel.org Return-path: Received: from mail-wr1-f48.google.com ([209.85.221.48]:46485 "EHLO mail-wr1-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733147AbeITFQ5 (ORCPT ); Thu, 20 Sep 2018 01:16:57 -0400 Received: by mail-wr1-f48.google.com with SMTP id a108-v6so7448528wrc.13 for ; Wed, 19 Sep 2018 16:36:39 -0700 (PDT) In-Reply-To: <20180919233624.18494-1-petr.vorel@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: Commit ad23e152 caused generate_nlmsg to be always missing: $ make alltests make: ./tools/generate_nlmsg: Command not found Create testclean: to remove only results directory. Fixes: ad23e152 testsuite: remove all temp files and implement make clean Signed-off-by: Petr Vorel --- testsuite/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/testsuite/Makefile b/testsuite/Makefile index d1ac997d..a31d4531 100644 --- a/testsuite/Makefile +++ b/testsuite/Makefile @@ -30,7 +30,6 @@ configure: compile: configure echo "Entering iproute2" && cd iproute2 && $(MAKE) && cd ..; - $(MAKE) -C tools listtests: @for t in $(TESTS); do \ @@ -39,9 +38,11 @@ listtests: alltests: $(TESTS) -clean: +testclean: @echo "Removing $(RESULTS_DIR) dir ..." @rm -rf $(RESULTS_DIR) + +clean: testclean @rm -f iproute2/iproute2-this @rm -f tests/ip/link/dev_wo_vf_rate.nl $(MAKE) -C tools clean @@ -49,18 +50,18 @@ clean: distclean: clean echo "Entering iproute2" && cd iproute2 && $(MAKE) distclean && cd ..; -$(TESTS): clean +$(TESTS): testclean ifeq (,$(HAVE_UNSHARED_UTIL)) $(error Please install util-linux tools to run tests in separated network namespace) endif @./tools/generate_nlmsg @mkdir -p $(RESULTS_DIR) - + @for d in $(TESTS_DIR); do \ mkdir -p $(RESULTS_DIR)/$$d; \ done - + @if [ "$(KCPATH)" = "/proc/config.gz" ]; then \ gunzip -c $(KCPATH) >$(KENVFN); \ elif [ "$(KCPATH)" != "" ]; then \ -- 2.19.0.rc2