From mboxrd@z Thu Jan 1 00:00:00 1970 From: Phil Sutter Subject: Re: [PATCH iproute2] testsuite: ss: Fix spacing in expected output for ssfilter.t Date: Sat, 10 Nov 2018 22:48:44 +0100 Message-ID: <20181110214844.GL6440@orbyte.nwl.cc> References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Stephen Hemminger , "Yoann P." , netdev@vger.kernel.org To: Stefano Brivio Return-path: Received: from orbyte.nwl.cc ([151.80.46.58]:35850 "EHLO orbyte.nwl.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725778AbeKKHfN (ORCPT ); Sun, 11 Nov 2018 02:35:13 -0500 Content-Disposition: inline In-Reply-To: Sender: netdev-owner@vger.kernel.org List-ID: Hi Stefano, On Sat, Nov 10, 2018 at 10:21:59AM +0100, Stefano Brivio wrote: > Since commit 00240899ec0b ("ss: Actually print left delimiter for > columns") changes spacing in ss output, we also need to adjust for that in > the ss filter test. > > Fixes: 00240899ec0b ("ss: Actually print left delimiter for columns") > Signed-off-by: Stefano Brivio > --- > testsuite/tests/ss/ssfilter.t | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/testsuite/tests/ss/ssfilter.t b/testsuite/tests/ss/ssfilter.t > index e74f1765cb72..3091054f2892 100755 > --- a/testsuite/tests/ss/ssfilter.t > +++ b/testsuite/tests/ss/ssfilter.t > @@ -12,37 +12,37 @@ export TCPDIAG_FILE="$(dirname $0)/ss1.dump" > ts_log "[Testing ssfilter]" > > ts_ss "$0" "Match dport = 22" -Htna dport = 22 > -test_on "ESTAB 0 0 10.0.0.1:36266 10.0.0.1:22" > +test_on "ESTAB 0 0 10.0.0.1:36266 10.0.0.1:22" How about using a regular expression ('test_on' calls grep with '-E')? E.g. this instead of the above: | test_on "ESTAB *0 *0 *10.0.0.1:36266 *10.0.0.1:22" Note that I didn't test this change, just made sure 'grep -E' recognizes ' *' as expected. Cheers, Phil