From patchwork Wed Sep 19 23:36:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 972010 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QdyhSV+X"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42Fx8X0W32z9sCP for ; Thu, 20 Sep 2018 09:36:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733301AbeITFQ6 (ORCPT ); Thu, 20 Sep 2018 01:16:58 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+rWRPHk2Fsgsb4qX7foO3/SE5iptU/tMos1sud91pdk=; b=QdyhSV+XQyboYR8WCSpmn59vsdw8bnzqyTTvOWQsvjR+XLsAypiU3OZ9LLxsUukmr+ V/auxGuNVxAG3rWxp1NVnxM+wqz653t1ESY6NdOi46mv3ixogYU/tf1Yx+GPiZNEt6iS lspPkSrRe9jGzXDl8WRE+T1DlG3up8R+zKsnggCa22UAN8V17FQXIjUJquv+bYRef0lF znHLB5XYonMm9GfMVgvLh33TVnD6I5QwBGNKmVdnzyk90RWIJJPZsfIguQTjWR1gz+XE wHaC/RlZEL13UPIeGJ+MdLVMS3rWd1ugFX4IY7ncJfYX34slwFYOyld5xNpoZ1ihstM3 Qd4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+rWRPHk2Fsgsb4qX7foO3/SE5iptU/tMos1sud91pdk=; b=E7XUuqt+lPveWJDNSOyqelHKW558M320bFd16uaq505RLoA3gpFCvReZONo9BAdZ0S cGmQfpFKMi/gkVqxPtHusf9iZJPreiH6fh6f+yNoj3G7x7R8MzttyfNyiaXqPT3XDQpr kJiNRJKx7OdwI4aCEvCoW5XN3rZy3Eev/9wS/FC06GBXcTtEaTlbU/ic7M6+Xa5msTdj 1vIttIZxK9lBSC7p9Nc2EmEDEXmrGUYPZJ+H9nVA3Oq5odrozBym6q2cqWsd4BsVRX08 a83zx1SoKNE2Bkkr1oCQcgZP6d21O/yFx9QMR/Efq694JC3JjtEyaRPWsteTDmkIp91Y ZQKg== X-Gm-Message-State: APzg51CF1oxRa4Crs4KSOdiUjzFfKyBzcJtCdNjA6BywJdYSrlal0Mgh e0KPUAxBEYs+ezDU58tztpjHtbws X-Google-Smtp-Source: ANB0VdbI+1Lf/VKpv0YoWnd+y699cLU2/i7M4k08MoftmXGxRKSrknOQa49fduppSofsW2KMcArLJg== X-Received: by 2002:adf:d4c6:: with SMTP id w6-v6mr30104826wrk.185.1537400198445; Wed, 19 Sep 2018 16:36:38 -0700 (PDT) Received: from localhost.localdomain ([193.179.3.151]) by smtp.gmail.com with ESMTPSA id w10-v6sm21920537wrp.31.2018.09.19.16.36.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Sep 2018 16:36:37 -0700 (PDT) From: Petr Vorel To: netdev@vger.kernel.org Cc: Petr Vorel , Stephen Hemminger , Phil Sutter , Luca Boccassi 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> X-Mailer: git-send-email 2.19.0.rc2 In-Reply-To: <20180919233624.18494-1-petr.vorel@gmail.com> References: <20180919233624.18494-1-petr.vorel@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 \ From patchwork Wed Sep 19 23:36:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 972011 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="haMy7w2f"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42Fx8X5Fctz9sBq for ; Thu, 20 Sep 2018 09:36:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387405AbeITFRA (ORCPT ); Thu, 20 Sep 2018 01:17:00 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:34085 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733138AbeITFQ7 (ORCPT ); Thu, 20 Sep 2018 01:16:59 -0400 Received: by mail-wr1-f66.google.com with SMTP id g33-v6so7490064wrd.1 for ; Wed, 19 Sep 2018 16:36:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DgCTmK/aG+9F3cJHRq/2f1SAPq//ro0bw4fKk7LMdZ4=; b=haMy7w2fbNGe9pk6/fveE6hV+MbfCsllHsOJ78a6nJmBiYZr7on+6gtk70Y+OXUK5n sv/3ZI0rs8v4uJz0/ehsn5k1ojnUZ0E+P2lDk9ZrdqUh51eBq9+7hTVw4qS5bY6vf82Y lXSGNSh0Nb6SKBWlLfhICusK0Hf/CaCDWtMr0mCiTI6zjFP+WSdIYavp+UiH4miycUc5 l/VuKfS2tFB4L5yKOmfjXvAKd/mfrB3Rigr+/K329YkH66UevlpeIg/nyilOQztmqjJT Rr3mxJNVBCLmh1Hgp31jq8LRHU5pPZLd9XkwAUjmY9QZGPcfbTmkuFAdBEE9EGWoKqgA cgfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DgCTmK/aG+9F3cJHRq/2f1SAPq//ro0bw4fKk7LMdZ4=; b=jSX4anHF/Ou+ufKwBtxud0v+bJ9BO/V3hGNibHDu9viyt8LoubviOGaLbhG9xSZdxY gT5dzroZmjuxu5UqXrJFeZMzuf/GE7phe/n2rbLYvx733eEjNHF7GQM4mZG6oN7PKJFH zc3bhrw6qjmC7heMrG3kgJUjNqIr/2TjiBc3WwHAFRazce6J5uClC/sVZvnaARJnmKV4 /UsVqfjqWUW6Su10pD62ROy/nx7ozubNC8yQL6u7dYPnMhPQEJbA3dM8PDwUuHLYO2zs aEs4LgQs02AVDwbTFw4vtlnjnPrKO5cLe52nivkEImvYe46MDYC6+yFYxNHqJdPigtzN 5vSA== X-Gm-Message-State: APzg51Ame7meaZsG1dWvJIVeE4Tc+khY1tsswZQ4YHk6fipHCNoQlbOR aufa+6SiYmKgD02rqaHkhFDPg7hK X-Google-Smtp-Source: ANB0VdYGuQt/97sJBbBaZCTn9Ng/EUG2YWCR5Um9sZ6CmMARKU6XrLjFJD2jUOrPKaCvY15+NDxITQ== X-Received: by 2002:a05:6000:c:: with SMTP id h12mr31329526wrx.103.1537400200314; Wed, 19 Sep 2018 16:36:40 -0700 (PDT) Received: from localhost.localdomain ([193.179.3.151]) by smtp.gmail.com with ESMTPSA id w10-v6sm21920537wrp.31.2018.09.19.16.36.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Sep 2018 16:36:39 -0700 (PDT) From: Petr Vorel To: netdev@vger.kernel.org Cc: Petr Vorel , Stephen Hemminger , Phil Sutter , Luca Boccassi Subject: [PATCH iproute2 v2 2/3] testsuite: Generate generate_nlmsg when needed Date: Thu, 20 Sep 2018 01:36:23 +0200 Message-Id: <20180919233624.18494-3-petr.vorel@gmail.com> X-Mailer: git-send-email 2.19.0.rc2 In-Reply-To: <20180919233624.18494-1-petr.vorel@gmail.com> References: <20180919233624.18494-1-petr.vorel@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit 886f2c43 added generate_nlmsg.c. Running alltests target, which uses the binary required to run 'make -C tools' before. Fixes: 886f2c43 testsuite: Generate nlmsg blob at runtime Signed-off-by: Petr Vorel --- testsuite/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/testsuite/Makefile b/testsuite/Makefile index a31d4531..1c2467f5 100644 --- a/testsuite/Makefile +++ b/testsuite/Makefile @@ -28,7 +28,7 @@ endif configure: echo "Entering iproute2" && cd iproute2 && $(MAKE) configure && cd ..; -compile: configure +compile: configure generate_nlmsg echo "Entering iproute2" && cd iproute2 && $(MAKE) && cd ..; listtests: @@ -36,7 +36,10 @@ listtests: echo "$$t"; \ done -alltests: $(TESTS) +generate_nlmsg: + $(MAKE) -C tools + +alltests: generate_nlmsg $(TESTS) testclean: @echo "Removing $(RESULTS_DIR) dir ..." From patchwork Wed Sep 19 23:36:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 972012 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="TG8CQ2Hc"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42Fx8h0jvBz9sCP for ; Thu, 20 Sep 2018 09:36:52 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387414AbeITFRH (ORCPT ); Thu, 20 Sep 2018 01:17:07 -0400 Received: from mail-wm1-f46.google.com ([209.85.128.46]:55733 "EHLO mail-wm1-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731442AbeITFRH (ORCPT ); Thu, 20 Sep 2018 01:17:07 -0400 Received: by mail-wm1-f46.google.com with SMTP id f21-v6so7953950wmc.5 for ; Wed, 19 Sep 2018 16:36:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xNz6Mx2kcxxUsETcZrCgZLVf5TQ9VJInGGbrBgKMiN0=; b=TG8CQ2Hc0CYriSuAegKyJOurO3IAj8P/RvOoopZdtBUBlX0WswIq+DmYZEAULQXDME X4M77cCX0J1a0nXX8/lOco+0AP35aoN3hth23DuqH5VXNXGEDnP1KhY7D07Xxvofx1RB hzMri7ShCQcbNvbG5cQHMggKJmYabXA3aZrdxq0WUciboBMzXcJ7zwy4yS6/faBDWM1z g1ITgmqqznNHvxF/+dhzYWm9Bk6ucfJVG861AUhjyUkpTHuROIvxwnVjzo24FJnWyzWt R+aQjts+I3xdzUt63q59diU22g8jDrMb3htItxEcvCMuaJbEX4WD901jeCzpEQDCGU0r cOwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xNz6Mx2kcxxUsETcZrCgZLVf5TQ9VJInGGbrBgKMiN0=; b=Qdlz2vWb6tu8z5j88to4z3w4anXLm9ZCIb4ysco1a5BQcOq/EOt39l10U2JLJWzkXL S6KOQePW0D0V1jTYO0YyPE4K1IfTjAeyeC41JQPPStR6ZYY1glG2SAwcazwGUWK3zA8t eI+vab4b+zYGFiG5LRAq6Xuj4pMgl1T9N7r8emACyuYslLeW3tUYC2epnjDCWGNSmsS7 HZWBjBl3AknfvQmECB0MCloOjFQrvdtuivAcOlq/GPq4gDsa0U1izWDNMsL+WnhmvTwS DKRW/YKi4QNrGUN8yv1/psxBTaUMH9oKRK3UBSEDNQfFAmE0dLDd//7Is9p84dmTHgde YY/w== X-Gm-Message-State: APzg51BiJR9+MMSqMdjqWUghl/JoWIPBfhDBZ9tPriIunfRXxllWbnYi seGpj/ewsHyF8hIq3QuOrJFP9Oez X-Google-Smtp-Source: ANB0VdZgR5L99sF4vMdxUhc5iQx9rwaj+0Tby12Bv2BYXxwCQKyuKz2K4WqhYVNCCrN+PVgMKrilEA== X-Received: by 2002:a1c:a507:: with SMTP id o7-v6mr156273wme.45.1537400208116; Wed, 19 Sep 2018 16:36:48 -0700 (PDT) Received: from localhost.localdomain ([193.179.3.151]) by smtp.gmail.com with ESMTPSA id w10-v6sm21920537wrp.31.2018.09.19.16.36.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Sep 2018 16:36:47 -0700 (PDT) From: Petr Vorel To: netdev@vger.kernel.org Cc: Petr Vorel , Stephen Hemminger , Phil Sutter , Luca Boccassi Subject: [PATCH iproute2 v2 3/3] testsuite: Warn about empty $(IPVERS) Date: Thu, 20 Sep 2018 01:36:24 +0200 Message-Id: <20180919233624.18494-4-petr.vorel@gmail.com> X-Mailer: git-send-email 2.19.0.rc2 In-Reply-To: <20180919233624.18494-1-petr.vorel@gmail.com> References: <20180919233624.18494-1-petr.vorel@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org alltests target requires having symlink created by configure target (default target). Without that there is no test being run. Signed-off-by: Petr Vorel --- testsuite/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testsuite/Makefile b/testsuite/Makefile index 1c2467f5..b3aebec1 100644 --- a/testsuite/Makefile +++ b/testsuite/Makefile @@ -54,6 +54,9 @@ distclean: clean echo "Entering iproute2" && cd iproute2 && $(MAKE) distclean && cd ..; $(TESTS): testclean +ifeq (,$(IPVERS)) + $(error Please run make first) +endif ifeq (,$(HAVE_UNSHARED_UTIL)) $(error Please install util-linux tools to run tests in separated network namespace) endif