From patchwork Thu Jan 31 22:35:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 1034504 X-Patchwork-Delegate: davem@davemloft.net 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=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="e5nw8HYa"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43rFS64PBQz9sDX for ; Fri, 1 Feb 2019 09:35:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729696AbfAaWfd (ORCPT ); Thu, 31 Jan 2019 17:35:33 -0500 Received: from mail-eopbgr20087.outbound.protection.outlook.com ([40.107.2.87]:63392 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728395AbfAaWfa (ORCPT ); Thu, 31 Jan 2019 17:35:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ESJ1Uuit49wDrNNGO3jFTzy0dZndVfRUMuwSi5fjXXc=; b=e5nw8HYaoi648DzZYP/7R/u5ejFmNZ8x3tMhY/imQutO5IvkQbGfypo3X5ekpPdXQYuNv5MS1cS0MrJgPOeDxkZNgadC47rFiSl6ysoOuiUm89mYb7ZydlEKyIbP2O5hLkn1CzzCYKt/S4zLaWzex37qsyOjxGpdl2Uju2GZC/k= Received: from AM6PR05MB4885.eurprd05.prod.outlook.com (20.177.34.225) by AM6PR05MB6599.eurprd05.prod.outlook.com (20.179.2.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Thu, 31 Jan 2019 22:35:27 +0000 Received: from AM6PR05MB4885.eurprd05.prod.outlook.com ([fe80::3830:b2de:562:1fe6]) by AM6PR05MB4885.eurprd05.prod.outlook.com ([fe80::3830:b2de:562:1fe6%4]) with mapi id 15.20.1558.025; Thu, 31 Jan 2019 22:35:27 +0000 From: Petr Machata To: "netdev@vger.kernel.org" CC: Ido Schimmel Subject: [PATCH net-next 11/11] selftests: forwarding: mirror_gre_flower: Fix test result handling Thread-Topic: [PATCH net-next 11/11] selftests: forwarding: mirror_gre_flower: Fix test result handling Thread-Index: AQHUubVD5DVCRxzerk2Al1UD3O21lw== Date: Thu, 31 Jan 2019 22:35:27 +0000 Message-ID: <79643a7d23a5d55468a65c3d7bddaaa8785e7fd0.1548973731.git.petrm@mellanox.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P192CA0100.EURP192.PROD.OUTLOOK.COM (2603:10a6:209:8d::41) To AM6PR05MB4885.eurprd05.prod.outlook.com (2603:10a6:20b:b::33) authentication-results: spf=none (sender IP is ) smtp.mailfrom=petrm@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [78.45.160.211] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM6PR05MB6599; 6:Foj61apMo/iNQlT5EmjGD6RljiWd3V1CD2WakzYWnl3cxxDUXt8+wqKFznzTlACvQlOKUt+6woFYYlD69Ycr9X48bW+NX9hHEA914TxMgKA+XAP7FhtOI4twYJFk2q0c1ZjXv2d6dMN99t9IxCFcYfwxqxX0IotslyqCIwxBUqJPdSA/3W7wEjrd2LX08uIWOXz1Ln+5JBfMLMvJ+WYzXj9lEumiqxr1fSCwXlgkBAMwP2M6QYR0YnC3o4KoOEOQX7heUoi/QeBBTih4xQquyewcbg1bPfDD0lGkvk++epO3aWe3ShDRabOfvg7fDmm4k4wCKHzNbZfl1siRZe1OEU0uafB+D5qPtRGZOwrqge9qwH/m204FBN+d4Wb6/oF5Q0Y5Ndhr8yqjmdCQ/tC9UmPQZ8Rqax5wVYjZ093WchkEKZnhwL3SXL74ZYpvfAFDoku7Yg44qnO2GTD/4y+pAQ==; 5:aISLAd6n/DgXNXFTnpBuC01W+HVpkOznlVFUv0IgXXmw44HkYZadcoGnrpSZ1uLMndkoB/v9V4ZTU9ACKGsnbm6MIMKfp9p9ehLHdZITWR4V/iyL4qPeakrDRssznJNZ+xW+IO7VqAyMZRDnxWRZ8PFD68B3pr8pf8dAUzjEnPq8KWiyus6d8WwBRXSie+AFHZbWmm/Yq9hc3rSw1AXP3w==; 7:MXlaNcKoLQhDeDj2cqtTbW4zH2qfR+ldGA3pBafQ4v6m1V2ZWl52air17Pftd1t1xPck8JdQwF5jT1qzoCZXYBZxu5pa2NSUB7HskWsoX2FBXaN0FVfHApypuRlaO9mb0H46cCUScc/OsFlBIEuzbA== x-ms-office365-filtering-correlation-id: 64e9251c-bb57-4657-c9ec-08d687cc65a7 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM6PR05MB6599; x-ms-traffictypediagnostic: AM6PR05MB6599: x-microsoft-antispam-prvs: x-forefront-prvs: 09347618C4 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(346002)(396003)(39860400002)(366004)(376002)(199004)(189003)(2501003)(68736007)(4326008)(8936002)(2906002)(186003)(53936002)(66066001)(25786009)(107886003)(86362001)(81156014)(81166006)(8676002)(1730700003)(7736002)(305945005)(36756003)(486006)(11346002)(446003)(476003)(2616005)(3846002)(6116002)(14454004)(316002)(256004)(99286004)(14444005)(478600001)(118296001)(6916009)(71190400001)(76176011)(6436002)(71200400001)(52116002)(6506007)(386003)(97736004)(26005)(102836004)(106356001)(2351001)(105586002)(5640700003)(6486002)(6512007); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB6599; H:AM6PR05MB4885.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: aPbpdog42fDCcbVZq1gI6WUVbOQU2d2xEn04YXUY8zBT9ZoFNoBahBiTPDwy9AQiGfEO68MUha74E8D5hTeP7L/TmGcTS8DHMMwGutd2DsRVRKdAPL3Z5aFcUcufihnK8ew0Eugb6C92ZEad0xrKZPZhTbd8jzVs1JswCli26s6SzmrtoYxIPtiENDPbzI4Z5JgrTZt7uofMV0shVEndl8vOlQ7WkH/9mJGHXBQ1qOgMYeL5AOjPZGLABaKzG1ZVqhVpMvEuk10RQgJUkdz2yMShL4a/PNODerLh2Hmo69pWmaV5r3cOghxMTCIPtuQu3bSFdlhskAhtUAcqBTC+weaESBmDYdfYNUyzMV9K1nJRmnr7QEd9zwgWgab8mIEbWqR4sVWAFmuGWF4xmeGjHq0JcMWwcbyTJ8ygCKx/g/k= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 64e9251c-bb57-4657-c9ec-08d687cc65a7 X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Jan 2019 22:35:26.6656 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB6599 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The global variable RET needs to be initialized before each call to log_test. This test case sets it once before running the tests, but then calls log_tests for every individual test. Thus a failure in one of the tests causes spurious failures in follow-up tests as well. Fix by moving the initialization of RET from test_all() to full_test_span_gre_dir_acl(), a function that implements the test. Signed-off-by: Petr Machata --- tools/testing/selftests/net/forwarding/mirror_gre_flower.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/forwarding/mirror_gre_flower.sh b/tools/testing/selftests/net/forwarding/mirror_gre_flower.sh index 12914f40612d..09389f3b9369 100755 --- a/tools/testing/selftests/net/forwarding/mirror_gre_flower.sh +++ b/tools/testing/selftests/net/forwarding/mirror_gre_flower.sh @@ -81,6 +81,8 @@ full_test_span_gre_dir_acl() local match_dip=$1; shift local what=$1; shift + RET=0 + mirror_install $swp1 $direction $tundev \ "protocol ip flower $tcflags dst_ip $match_dip" fail_test_span_gre_dir $tundev $direction @@ -108,8 +110,6 @@ test_ip6gretap() test_all() { - RET=0 - slow_path_trap_install $swp1 ingress slow_path_trap_install $swp1 egress