Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp341785pxx; Wed, 28 Oct 2020 06:17:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwMPZETzU3vircF4UeKE12wmq+6V5ZLYy4sz+z5X3BJmJADXanwdtJWddlGQa7vFNO+4Q8N X-Received: by 2002:a17:906:6d83:: with SMTP id h3mr4363221ejt.481.1603891065228; Wed, 28 Oct 2020 06:17:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603891065; cv=none; d=google.com; s=arc-20160816; b=oAdOsGaHkFWViYs5ioU/3IevVffPDhBjclrWP7YdwrU0nVah4DDoi22dc72Y8G833N aF9von8AMxQzdSXUnuCDLnGrBxBEzmYmGaCjKK/7/WqQbgMCu3Kp7djMUnjywUTiI1oj sXUKEHSt3yir4Sb4ArP3215MLxu9+NnE8lLnma2IB7Ppy3zmYDfknSFP2261qBLT2rof MiTrH3DR6mWdllLNF3e/fY0bqsC/LCp4yt56cBElfOE4eB2QE04+obn3UtLKhUyjRmsO TbwuzrSpruI4sufx08jhexvn0Y+lrQ0E7drZLyUcAfppkm2em3uG8delUaShPdLvPcFY XTGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=LFIiQusG6xQITTq/7wKoNPI2kuC3ySDwKht/7y7j+UA=; b=MxCxMUP3W8Qo4hRIjsy6mqGdPz1J0YXQ9kXlt+PzqgsVwKsVWy2NwDQryCapgZey71 PQMsg8hU21zhDOR9MEziBkYJf38gBlbzPn4AO5SzDjFGhMxX4Vb2zqv/xK/02Hf2T86X wxTiBFeE7lGHKkUHze+fY0n8Ap8gs5xYAkXBbKGPHlpl/RE3yFEvtlVl4POiKGpPIEEh qftade7/ZFlh4c3g89YcCBfOPho/jwp9vBiDtasD4196auh6sUNmSSeJm+3YBILsVU57 yS7NdpVR3B2n0+7jxRGHAr3tpSiJI5m3kUYvVszMbttLgX4fp0csn2bgbUJmW88h6vXO YLuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=VEPRbbi8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z8si2802677eju.267.2020.10.28.06.17.21; Wed, 28 Oct 2020 06:17:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=VEPRbbi8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1800388AbgJ0Pfs (ORCPT + 99 others); Tue, 27 Oct 2020 11:35:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:49314 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1799571AbgJ0PcN (ORCPT ); Tue, 27 Oct 2020 11:32:13 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F1F6822202; Tue, 27 Oct 2020 15:32:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603812732; bh=XMkQTYUfMEhIA+a+lO8Oxa/bNczWeriCd977SjZGeZg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VEPRbbi8QABpuqWPUcJ1aTsq80ZnwZUrPXE6ZhVteOzKirsx9y02Az0bbiBhjyONO 9T9Lm4kUwuPEMRiQix4H3JLc8WJDwbQM5ygin71sK7KSX4tQFoYfVW0tqrGCzCStta VE1lOlK0NRUsO/UbzTh0nNIx1GIfGxqxZCjK81Fw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Matthieu Baerts , Paolo Abeni , "David S. Miller" , Sasha Levin Subject: [PATCH 5.9 281/757] selftests: mptcp: interpret \n as a new line Date: Tue, 27 Oct 2020 14:48:51 +0100 Message-Id: <20201027135503.757829789@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135450.497324313@linuxfoundation.org> References: <20201027135450.497324313@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Matthieu Baerts [ Upstream commit 8b974778f998ab1be23eca7436fc13d2d8c6bd59 ] In case of errors, this message was printed: (...) # read: Resource temporarily unavailable # client exit code 0, server 3 # \nnetns ns1-0-BJlt5D socket stat for 10003: (...) Obviously, the idea was to add a new line before the socket stat and not print "\nnetns". Fixes: b08fbf241064 ("selftests: add test-cases for MPTCP MP_JOIN") Fixes: 048d19d444be ("mptcp: add basic kselftest for mptcp") Signed-off-by: Matthieu Baerts Acked-by: Paolo Abeni Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- tools/testing/selftests/net/mptcp/mptcp_connect.sh | 4 ++-- tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/testing/selftests/net/mptcp/mptcp_connect.sh index 57d75b7f62203..e9449430f98df 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -444,9 +444,9 @@ do_transfer() duration=$(printf "(duration %05sms)" $duration) if [ ${rets} -ne 0 ] || [ ${retc} -ne 0 ]; then echo "$duration [ FAIL ] client exit code $retc, server $rets" 1>&2 - echo "\nnetns ${listener_ns} socket stat for $port:" 1>&2 + echo -e "\nnetns ${listener_ns} socket stat for ${port}:" 1>&2 ip netns exec ${listener_ns} ss -nita 1>&2 -o "sport = :$port" - echo "\nnetns ${connector_ns} socket stat for $port:" 1>&2 + echo -e "\nnetns ${connector_ns} socket stat for ${port}:" 1>&2 ip netns exec ${connector_ns} ss -nita 1>&2 -o "dport = :$port" cat "$capout" diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh index f39c1129ce5f0..c2943e4dfcfe6 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -176,9 +176,9 @@ do_transfer() if [ ${rets} -ne 0 ] || [ ${retc} -ne 0 ]; then echo " client exit code $retc, server $rets" 1>&2 - echo "\nnetns ${listener_ns} socket stat for $port:" 1>&2 + echo -e "\nnetns ${listener_ns} socket stat for ${port}:" 1>&2 ip netns exec ${listener_ns} ss -nita 1>&2 -o "sport = :$port" - echo "\nnetns ${connector_ns} socket stat for $port:" 1>&2 + echo -e "\nnetns ${connector_ns} socket stat for ${port}:" 1>&2 ip netns exec ${connector_ns} ss -nita 1>&2 -o "dport = :$port" cat "$capout" -- 2.25.1