From patchwork Thu Jul 5 19:10:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 10510209 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CCDEA600F5 for ; Thu, 5 Jul 2018 19:11:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BA7392766D for ; Thu, 5 Jul 2018 19:11:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ADFD927853; Thu, 5 Jul 2018 19:11:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC6972766D for ; Thu, 5 Jul 2018 19:11:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753947AbeGETLL (ORCPT ); Thu, 5 Jul 2018 15:11:11 -0400 Received: from mail-eopbgr80045.outbound.protection.outlook.com ([40.107.8.45]:58033 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753927AbeGETLJ (ORCPT ); Thu, 5 Jul 2018 15:11:09 -0400 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=vl1y7pQLwkRHLBhyke68WW+JNE0qOsxDrjpfcTkmoBg=; b=nk0hRYB1194fCBnrin8LKBjvwQIRyoiEb60YwOo+cBQfJkuAWG09DUJdDnS44NU7wXqYtE9gzbaxoogs63HYXd0HvhwN/xaG6mN0u77FPD14saqTE5jhwhf4uIWgo69G1TP1p2IAp4gbRZjmk1igoj5W/hdIprEF8swwudQZeDo= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=petrm@mellanox.com; Received: from t540p (78.45.160.211) by VI1PR05MB4190.eurprd05.prod.outlook.com (2603:10a6:803:4e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.930.20; Thu, 5 Jul 2018 19:11:05 +0000 From: Petr Machata To: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: jiri@mellanox.com, idosch@mellanox.com, shuah@kernel.org, davem@davemloft.net Subject: [PATCH net-next 1/2] selftests: forwarding: Allow importing dependent libraries In-Reply-To: References: Message-Id: Date: Thu, 05 Jul 2018 21:10:59 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 X-Originating-IP: [78.45.160.211] X-ClientProxiedBy: AM0PR01CA0030.eurprd01.prod.exchangelabs.com (2603:10a6:208:69::43) To VI1PR05MB4190.eurprd05.prod.outlook.com (2603:10a6:803:4e::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4ed7a5e2-5d42-4687-a7bb-08d5e2ab0ef9 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:VI1PR05MB4190; X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4190; 3:I9iW0zkJFc7XaDMaLB9FE7ac2laLCVFpUCck1LIBJc+XUfgaZom3iNX/0wGvWcjmH480iIKIUxTYjSyrLeOiZhVzbWQCQCB/A0FpAZQR/2FG/3BI6NiQP1aCNhtkMxqxz2bbUDqRDPjvFeoI2cE3WZtpjf7YfvfMJSig7S8ItKZE71SiyHu24BjCEfnWtf9keXEHy36VBkuh4YX1R4yz1oeiXAEFE6HkKBE6t0xMsCeb4YAQ0FAhDj9Rn1YqaWVl; 25:xcARFcR4+JtYcS3nNrSmQHZWkIFmCF8H+fssAFy1PtvQMlOKvol4bLxBIOIBfaT3QHX/UiAsj6sxi6ZxRRQvhP8Uf+YfwoUzHwM7UuFGr8/Py2RKxssIxD+yAP6TsjxaSPlZune8nAv5FaiFVvX5HQ0UDenujZ0KQzpPLlNO5X/KepxmhqreUAHCy2HbTv3E6L50WPXojugk1zWJyVTXfI348WXIZogzXshwCtEd2uue9W+JZKpx3aWja4BtwrXKBeS+0e4HN+Xm8mp5Ctk+Ged+gptDMB2g3pIim8DmK8g753mU9gXJhyZMIMbHTRchM/RskdXt9ZyocNMHuvQemg==; 31:D5vXA12eqlHq9FO3jf0n6/MnrfuzuOV9QYw+vBZ61HvE9sm2HIXd9FGmSaIw7fgNRZr5RugHHQ4H1fCX7lpiSJb1KCftC6V+8/Dr0gJIvMNUKBDTipzN2kNc9IE8iPiNui41O8yLhpDbcQ65e1U2cBOX2p9Q8l3eGmYg035St3BAAdEeIPkkUum3NgZqTZ98BZBcX3Q3OReWNPOw4ihpVpBum9lUIr4oe0yCvOpximA= X-MS-TrafficTypeDiagnostic: VI1PR05MB4190: X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4190; 20:83AcCmiTYI8LZeLpDxjG2DDgCRiRh2HgKHnIc1YIVfdLplFGM73sE4tJQmVJjNSK5QUzi/hJTNpwyMMdodV7q8b7bl/xieZNt8gzWBZumL2h6InoaSZsv8a4XMBz9zg55i2cyaUhVBhLgTlEjQW8g4gIEC6H8Tk9jAyX+ZLuiyAt2dsX+cMCM+h8WDFTlIowPyL+UK2IlMxVAIhddYiGri3AyjV0dNIJBdcRjnXqXvg7m0U+dIcAHNFfv4zwyVIGAhNbkt1/Ke4qO3xN5u6F5Vo8HrUqPgy9cDMEec+BB1d6bj8HGtmQj5c3PMgYZAHODcYcfxjB5ayr090l8UbnvgbCkIn7IdbBJYJ1URIfXYAeEH3sEh++26g7Cmmwd/m7OXI693mRclHA4fHE2U52XxQhWVP3s2w6oTiu9jXE+c/Vd/XpRUEBQBLQIok0361k07e2SfpmyPHhjj/33+yCdxLJSq4rVAxfh6n09dqkJDryHr86BAniVaclKvC2Vsh6; 4:jv2caWg12eoRCNklTSJiii2vLZJ92HaPAwmmU6Un+4tKRMSRg3xKBfuuqleSPUGmza0iblYiOw+Ml8C3LgmdrbSaGGghHrIDhfmCIzfhDZIW9mAhrUfa/KU6jMNNEnhtnrruZAAaH0SXZPVMGjJcr3FOK6mmSUbU12p9YsWUpnbhVjJkiITydIaIlWVgGneuXKUV/InsDyicwNGmkXoGDfN1HsZrjYITSYNnpRc4OE3yHMFlPBDafdDIK1XYkWenFBSbVZSFc45lVcvnaogWrA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:VI1PR05MB4190; BCL:0; PCL:0; RULEID:; SRVR:VI1PR05MB4190; X-Forefront-PRVS: 0724FCD4CD X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(39860400002)(136003)(376002)(396003)(366004)(199004)(189003)(386003)(47776003)(4326008)(2906002)(26005)(50466002)(48376002)(66066001)(316002)(58126008)(25786009)(76176011)(51416003)(16586007)(52116002)(6486002)(86362001)(6496006)(478600001)(36756003)(106356001)(118296001)(105586002)(68736007)(53936002)(305945005)(7736002)(97736004)(81156014)(11346002)(81166006)(8936002)(3846002)(6116002)(956004)(16526019)(486006)(8676002)(2616005)(186003)(476003)(446003)(5660300001)(6666003); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR05MB4190; H:t540p; 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-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR05MB4190; 23:shcm5rY1IEeDPSiUnr2DpKf/NvcjpPpi7b5/rAP9A?= =?us-ascii?Q?/2EnW/+0nIRVFFcOiYPpj23fvnBxg5qVNT5luqpmVCixLdQZzQiBJ39kF7JR?= =?us-ascii?Q?nMTM4HZnpErBaWH3ENzEcvdAUOPwmZJ6RFr23spUQvmjGsdQ3IF6FE6wRWtP?= =?us-ascii?Q?eNyqTxHcY2dkXJe92GaToePmyCYBtmhyPEY/J2BkiIkEXy6N7CbNSifGj/Dj?= =?us-ascii?Q?XvkINMcqaMNAeJquOiKrGZXV0XMyZH6iMJtLE4qlZCZ0aqMaqEvttj3hCFmd?= =?us-ascii?Q?TaqABUE+SCxQv5YjzZTIO5h0ZHf+WHG48KmB9om387a0R9PtQ+Ub/sUMTT/m?= =?us-ascii?Q?eAg3hT+p3qYpk0MP1qQ0b78rl3NCS7oeWsv1yhEnO+QdPtM2fpgiDlpa83XR?= =?us-ascii?Q?t1P0UiEX9cEI/Hh82caAIRYILvJfY6aJxTyP90JfEygjtJNEk98whHmTr6Ma?= =?us-ascii?Q?dAfq2wUHUKVvDlnePgQK5bO1YTtMk1md3Zqv/AVBnMXwPpKsXFAxe78s99Ho?= =?us-ascii?Q?4omInLDvvHq2rTza66yqLO0hNTwYTqsLnJ2FMQVhoROQWR3q6CyVE4NFUPlX?= =?us-ascii?Q?HaS+h4WuMtb4nUG4LUQAmd4lzhhH9W46Qz5rdEVPNOGHtoa2Tg04jSwckrPu?= =?us-ascii?Q?hUOCroksOGPOAP1cCtzs8+z4uDjIUOB2nsQyFe6W4tim31uT7BcHbKkX/e3m?= =?us-ascii?Q?jurQGCoSWVJJaGU1UxG2ooMIlkEw/+JXD7+UXfZaS4DqIiniRPdUJzgfhao2?= =?us-ascii?Q?UGll70d1CWWGcnoJZEHnpoF6mh3KCdMgbk+ck7P3MCGPRwIpSjujLObw6ozL?= =?us-ascii?Q?7UxlPBPKdmeRthfe1DsVzvO77AAGDQ+TXNZBIug3lNgOydQ0IRYJG0+CxeS8?= =?us-ascii?Q?pxsRiX82nDogMAE1+FwoYjvv35k5IgmNG/dpLuIXYBxIGNxnR32gXub3Oxl7?= =?us-ascii?Q?vXq0IYPDBauXM9lJWjifgZqvOe3aKe3OCdY7Rtjh5By+DONO7qBKTXLf+HZ+?= =?us-ascii?Q?Qwxatb6ylp47eFfKQyaBvQ3KXRAb1VZe5mllsesCg3wq6CGmNm9Ae2teZqZm?= =?us-ascii?Q?0PrCirve/ntVyvFwKfNiQ3D/7BU0APonaPFw95/r0bb1Kjde8JE3wsWzLmMj?= =?us-ascii?Q?7Coz0A+2nVl/aikEjgn8Ow0P516+3+9?= X-Microsoft-Antispam-Message-Info: KNB0YOy8Pb9sFJT/IKrqDSc7OyXM4drbqdRxRA0dfKKKVYFtks9hw4/8ZIH9RQV23tEy0lLNj5c0zJ+SLcQ26Hwin9PlzecRyMAc7uhWkbpuIQifCP3LeeBO9OZmAHpDpfaAywEYufuRbQVL90X7n/QTBGHTO8ZnCE9OW9rKsd1QLIMRYufCkQDct+1LN1kg6k5bCNqmsxEIJvOlf2ZTEm8qI8KJmGS9dvXzY14DdA1RbZV/Um9LSCZy58hoGLIgKFMJjWqHr/cDRzPc/ih1BxZ3tPKb/XLvCQdye3mKb5lkDWqcWasdY0HNnK9xO0cdiSD7AB2hvhWQacGuqoX+DW0Oe0C8ItdfGAn3i6nukVk= X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4190; 6:woNqSZFRkpYN4mJ4/q4ohkfMracha85IH7EdSAaZcw0V7VgezCogGWTNChAn+PKKYawOdJfOpxxo62AeUfaqdskZEpZrgsMXx8GIdKp4uNZ6A0UIsJKuCBNnj8UDNFlJVVtQ7GQjIHF2CWZjNGWI6uq67Is4AqnGyHr/DU3rHbb7g5sVqnuakkIxx19hTVLpVp8fuAlQTUU4fuOs3N1XscmYxL2D0Z9zAIRSkG685lL5yYrBhYEMLbsdEkgGqesXWOTOPZJI0SpJD2aBoEI5J5DUMBWvMthSEhINHvbs1yeVWtdddMwqWwLVIXPd7QX+INsT6iPdkW1OcnHI84G6PvcOZh2ItU8nvmlC0J4AHFaM59Qb7UyDW4bXG5gZpUjVbjhg34Et4E4JGh/aJtaH9Y7BNhf/wMlltT+iXU+BXiVCI9wsmw4VMe/IPANY3oijZRG5yrsydKlaDRaxCEOtfw==; 5:t3ecMZABYwjKk1+sqsGuPZIXenWLkpVflKRNMnNctXEd3+JntomVGj535e7ztW2IPpuhkNl2JEpwxJWtoCZr1uARFSCDGRUkvSLaMBdR+afS9ruaJPM7rm0teRzi+varTea1BMsApKRkvJjFmZcnbaJuAymRbtP6HYXCaQWBG4o=; 24:RcQ6CG3jaCZP1PcdXN0894LZIHnCpQ5JdUai61A8NqPxEd/1Z8XZAhMGypZg/ZyaywmZzQQwwM+oeH3c0Du2pqcVypJMBqknTPiQluTdRBo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4190; 7:9tyAfjAqjAouCAzfaoL0Ryozftuw05qSanpIO34xk42K17ZfQDkODf5DpbPkcviwHC64KhlzkVcAG3y9tOCWapt5pb3+anD9fcv9FuD9rDTO1ChU7UFSiyzuTjHvyWcCrKbsjJJCuIbotDV3y8KN7BAjwyWbnG3zn4JPEDN7yCdD9mywzj4FAo2jrWjz+RmIz3flCKWBe5koofAVuFZe9VUoe+8NH/olM01/13vk2/cBe8yTjMv7nOCMaH+nN+B/ X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2018 19:11:05.5736 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4ed7a5e2-5d42-4687-a7bb-08d5e2ab0ef9 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB4190 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The next patch introduces a new mlxsw-specific test that uses mirror_gre_lib.sh and mirror_gre_topo_lib.sh. However when sourcing their own deps, these libraries assume that the test that's running is in the same directory. That's not the case for driver-specific tests. So change the libraries to source their deps through $relative_path. That variable is set up by lib.sh, which should be imported by the test in question in any case. Signed-off-by: Petr Machata --- tools/testing/selftests/net/forwarding/mirror_gre_lib.sh | 2 +- tools/testing/selftests/net/forwarding/mirror_gre_topo_lib.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/forwarding/mirror_gre_lib.sh b/tools/testing/selftests/net/forwarding/mirror_gre_lib.sh index 1c18e332cd4f..fac486178ef7 100644 --- a/tools/testing/selftests/net/forwarding/mirror_gre_lib.sh +++ b/tools/testing/selftests/net/forwarding/mirror_gre_lib.sh @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 -source mirror_lib.sh +source "$relative_path/mirror_lib.sh" quick_test_span_gre_dir_ips() { diff --git a/tools/testing/selftests/net/forwarding/mirror_gre_topo_lib.sh b/tools/testing/selftests/net/forwarding/mirror_gre_topo_lib.sh index 253419564708..39c03e2867f4 100644 --- a/tools/testing/selftests/net/forwarding/mirror_gre_topo_lib.sh +++ b/tools/testing/selftests/net/forwarding/mirror_gre_topo_lib.sh @@ -33,7 +33,7 @@ # | | # +-------------------------------------------------------------------------+ -source mirror_topo_lib.sh +source "$relative_path/mirror_topo_lib.sh" mirror_gre_topo_h3_create() {