From patchwork Mon Mar 30 14:23:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Baerts X-Patchwork-Id: 1263970 X-Patchwork-Delegate: matthieu.baerts@tessares.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.01.org (client-ip=198.145.21.10; helo=ml01.01.org; envelope-from=mptcp-bounces@lists.01.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=tessares.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=tessares-net.20150623.gappssmtp.com header.i=@tessares-net.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=wX1hRieN; dkim-atps=neutral Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48rZTs53V5z9sP7 for ; Tue, 31 Mar 2020 01:24:32 +1100 (AEDT) Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 2395610FC388F; Mon, 30 Mar 2020 07:25:18 -0700 (PDT) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::442; helo=mail-wr1-x442.google.com; envelope-from=matthieu.baerts@tessares.net; receiver= Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 1C1DB10FC36E5 for ; Mon, 30 Mar 2020 07:25:16 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id m17so21829090wrw.11 for ; Mon, 30 Mar 2020 07:24:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EhYefHey9uPfk3DFQ/3jm1vdYJVN5Kpj0zlBoZ4NBzw=; b=wX1hRieN/xZKXphFgTKe64yuK9o+rCgpphBlswk2qZFCgF3FOoe2tgc+1iZ5Ch27Ve afOPszc7U1v8PlSEhKSrkcIRwaWepY88L9RMCYcaiZ9mjtMWf5QNk/wsKHZzU2ylx3Kv EB63B7cxIWao4iWjrGESxos/0/o1vhCrYib4Dsw3y7KfwS2nQnaH9hAobd8RQqRqgzu7 RyRmaufqUETZRXWsmpIOIDf23P8kENoDoFyicppELC2FKU1jpjkuO2ns1fxRVd/NAeL/ xP2Dze1PgJpyLTBTTE4S2JkkYsRlav5IA/eR7MCX6nHn364tpXcb72JkqxgDMoKqYQhX 6EzA== 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=EhYefHey9uPfk3DFQ/3jm1vdYJVN5Kpj0zlBoZ4NBzw=; b=ljqXII+7437KhNoOHva31V6Zl8gMhZN7f/efTmbptZ74XxFsJwl4H/6wvrWtDjbp38 PbdDet1XCmTaMmUPbunw7Me3Q8dt1VZCtDUTjGRPpxnbseDM9ghhz2bH2doCLS/RELg/ qsvbyvijk4hW975VJ269acY3dPyxfppKqUtC5CXwV+3NYkfd2NF3BCQ34AqI7kIpSqGp uDmlgLhwj+FHv7Q2UIKoiaBjRFJtJkxW5bHf21T6CBnHPZk8pNNtQCjXO5h+w07X/jFQ XFckjJHiSgRmhlezfQxnncG8GMW6cZi5FDufTh6BTglcXss3GTw9kI9OaAfVRgcvkzLx YJgg== X-Gm-Message-State: ANhLgQ2cNk5g36JOMFUP4fum4Hee2bZjZPLAvtooDSbDFrYSYaOF9j14 hq6TbNdN2h4IFpmXOdmVFfVG1g== X-Google-Smtp-Source: ADFU+vuVS9XnafD6XDFU33nulXJNMftfAUIOSUQENG/9dNdU5QH43S+EJW46gNquMyNujDyt0lF40Q== X-Received: by 2002:adf:d849:: with SMTP id k9mr15043107wrl.108.1585578264756; Mon, 30 Mar 2020 07:24:24 -0700 (PDT) Received: from tsr-vdi-mbaerts.nix.tessares.net (static.23.216.130.94.clients.your-server.de. [94.130.216.23]) by smtp.gmail.com with ESMTPSA id 98sm22956856wrk.52.2020.03.30.07.24.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Mar 2020 07:24:23 -0700 (PDT) From: Matthieu Baerts To: netdev@vger.kernel.org, "David S . Miller" Date: Mon, 30 Mar 2020 16:23:54 +0200 Message-Id: <20200330142354.563259-2-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200330142354.563259-1-matthieu.baerts@tessares.net> References: <20200330142354.563259-1-matthieu.baerts@tessares.net> MIME-Version: 1.0 Message-ID-Hash: 64FOPNTBWIPI5ERILUSGRQOXM2LVJWUK X-Message-ID-Hash: 64FOPNTBWIPI5ERILUSGRQOXM2LVJWUK X-MailFrom: matthieu.baerts@tessares.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: mptcp@lists.01.org X-Mailman-Version: 3.1.1 Precedence: list Subject: [MPTCP] [PATCH net-next 1/1] selftests:mptcp: fix failure due to whitespace damage List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: 'pm_nl_ctl' was adding a trailing whitespace after having printed the IP. But at the end, the IP element is currently always the last one. The bash script launching 'pm_nl_ctl' had trailing whitespaces in the expected result on purpose. But these whitespaces have been removed when the patch has been applied upstream. To avoid trailing whitespaces in the bash code, 'pm_nl_ctl' and expected results have now been adapted. The MPTCP PM selftest can now pass again. Fixes: eedbc685321b (selftests: add PM netlink functional tests) Signed-off-by: Matthieu Baerts --- tools/testing/selftests/net/mptcp/pm_netlink.sh | 12 ++++++------ tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testing/selftests/net/mptcp/pm_netlink.sh index 8c7bd722476e..9172746b6cf0 100755 --- a/tools/testing/selftests/net/mptcp/pm_netlink.sh +++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh @@ -75,29 +75,29 @@ subflows 0" "defaults limits" ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.1 ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.2 flags subflow dev lo ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.3 flags signal,backup -check "ip netns exec $ns1 ./pm_nl_ctl get 1" "id 1 flags 10.0.1.1 " "simple add/get addr" +check "ip netns exec $ns1 ./pm_nl_ctl get 1" "id 1 flags 10.0.1.1" "simple add/get addr" check "ip netns exec $ns1 ./pm_nl_ctl dump" \ "id 1 flags 10.0.1.1 id 2 flags subflow dev lo 10.0.1.2 -id 3 flags signal,backup 10.0.1.3 " "dump addrs" +id 3 flags signal,backup 10.0.1.3" "dump addrs" ip netns exec $ns1 ./pm_nl_ctl del 2 check "ip netns exec $ns1 ./pm_nl_ctl get 2" "" "simple del addr" check "ip netns exec $ns1 ./pm_nl_ctl dump" \ "id 1 flags 10.0.1.1 -id 3 flags signal,backup 10.0.1.3 " "dump addrs after del" +id 3 flags signal,backup 10.0.1.3" "dump addrs after del" ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.3 check "ip netns exec $ns1 ./pm_nl_ctl get 4" "" "duplicate addr" ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.4 id 10 flags signal -check "ip netns exec $ns1 ./pm_nl_ctl get 4" "id 4 flags signal 10.0.1.4 " "id addr increment" +check "ip netns exec $ns1 ./pm_nl_ctl get 4" "id 4 flags signal 10.0.1.4" "id addr increment" for i in `seq 5 9`; do ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.$i flags signal >/dev/null 2>&1 done -check "ip netns exec $ns1 ./pm_nl_ctl get 9" "id 9 flags signal 10.0.1.9 " "hard addr limit" +check "ip netns exec $ns1 ./pm_nl_ctl get 9" "id 9 flags signal 10.0.1.9" "hard addr limit" check "ip netns exec $ns1 ./pm_nl_ctl get 10" "" "above hard addr limit" for i in `seq 9 256`; do @@ -110,7 +110,7 @@ id 4 flags signal 10.0.1.4 id 5 flags signal 10.0.1.5 id 6 flags signal 10.0.1.6 id 7 flags signal 10.0.1.7 -id 8 flags signal 10.0.1.8 " "id limit" +id 8 flags signal 10.0.1.8" "id limit" ip netns exec $ns1 ./pm_nl_ctl flush check "ip netns exec $ns1 ./pm_nl_ctl dump" "" "flush addrs" diff --git a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c index de9209305026..b24a2f17d415 100644 --- a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c +++ b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c @@ -335,14 +335,14 @@ static void print_addr(struct rtattr *attrs, int len) error(1, errno, "wrong IP (v4) for family %d", family); inet_ntop(AF_INET, RTA_DATA(attrs), str, sizeof(str)); - printf("%s ", str); + printf("%s", str); } if (attrs->rta_type == MPTCP_PM_ADDR_ATTR_ADDR6) { if (family != AF_INET6) error(1, errno, "wrong IP (v6) for family %d", family); inet_ntop(AF_INET6, RTA_DATA(attrs), str, sizeof(str)); - printf("%s ", str); + printf("%s", str); } if (attrs->rta_type == MPTCP_PM_ADDR_ATTR_ID) { memcpy(&id, RTA_DATA(attrs), 1);