From patchwork Tue Jun 5 13:07:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 925462 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="k2nQ4yVh"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 410XCL150vz9s1B for ; Tue, 5 Jun 2018 23:07:26 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751880AbeFENHX (ORCPT ); Tue, 5 Jun 2018 09:07:23 -0400 Received: from mail-ve1eur01on0048.outbound.protection.outlook.com ([104.47.1.48]:52917 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751662AbeFENHV (ORCPT ); Tue, 5 Jun 2018 09:07:21 -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=TXuNh3/o05oC+V+TtIXqxYRxHW3BB2irni9XGjEMb3Q=; b=k2nQ4yVh/FvIPBqA3CqyQE1b+J/3rFKm8uqj6+pq/Ged9Xbb5xIu5cBnfVVp51cl6CFaBlG6vKafxJ5I36RcOK6e9WptGtBIJZC+G9FH+7F+2ATrGtFoz8Gn+G7beJW/y/FUzHP/aqLfLOSk4pH9Y4TloQ5IwrxLWA2QLmuPiOU= Received: from t540p (78.45.160.211) by AM0PR05MB4180.eurprd05.prod.outlook.com (2603:10a6:208:57::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.820.11; Tue, 5 Jun 2018 13:07:17 +0000 From: Petr Machata To: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: davem@davemloft.net, shuah@kernel.org, idosch@mellanox.com Subject: [PATCH net-next] selftests: forwarding: Fix importing dependent libraries Message-Id: <1ee588d3867b411485be29e45ebbda050920544c.1528203928.git.petrm@mellanox.com> Date: Tue, 05 Jun 2018 15:07:12 +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: CWLP265CA0024.GBRP265.PROD.OUTLOOK.COM (2603:10a6:401:10::36) To AM0PR05MB4180.eurprd05.prod.outlook.com (2603:10a6:208:57::29) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(2017052603328)(7153060)(7193020); SRVR:AM0PR05MB4180; X-Microsoft-Exchange-Diagnostics: 1; AM0PR05MB4180; 3:z3vGNJQFtHeGaNe2TA+sajZtcjs/eHu0aXbBOtX8uZtJusbgldPaTl9iG0k963vxFHJ0WyF/o89Nr2YG2M1Y712T9bo+ItBPJaRyAwCn610wIpEbFWqVlvLM3RZncDppjJenLz6+ne2wQ1KxC0ucyDdLSqsgaGMZNYcix2AgHnByb+2DAtC4/CAQy6BN+3VNZ6Y7ElS84U/sFnCsxs/vU86gf4Fz2RTO524Yaw9pMtUFXHt4SPp0qToGax5M/2NE; 25:HpNL1RviN98I98eU+svv6LBviWFzevXZYyrmFNdBgZnpMVRUfHntJetrGyWl6no46BCkdEGppiANqOKblHE6HOLPT+dUu9aMb2Iv6L8WqcETM8SRmLRiNgeCBXXtTI9CGHEdIYKdUSDLx1reGV+2bSU/mRSPVubj95GjFWqQ+GdyP7Omsea4LeoR9rC9MbLvlcANSGj5P7620ax8kLszGPSvelX5IukXTxdV7gNX/+n7v9VmWnG4F1MtsMV/R1XPnLIFNB/KjRlfzqQBKhWl/98FAINDWauapiKh3K71+grUtXxf8Poy0zfEGJcgzK7sKfcYrnYtrmMgGx5S3Rf/Uw==; 31:Bogb/LA6hBd9R7Hns6MathhQv3shDEwCrv1rZZIF170TzWUaAZf5C0ndW7sfIkeNKpuTMtgEALTXx1kcOkNJ/Cnrt64f2j3FlAypL81R5wqg51L1275Bw3jD65z80vCk2HyfZmxTMEcqy6Vgz0bsIJjQNJrmq2KhS4hUhJfZCCQKIoPYjzMzxBmI+nCapl3LwFzLyUWHr4UPfdFwWDTZiRg6AMorN0wxI5BickBzRHw= X-MS-TrafficTypeDiagnostic: AM0PR05MB4180: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=petrm@mellanox.com; X-Microsoft-Exchange-Diagnostics: 1; AM0PR05MB4180; 20:Z54uy/jcm2uHi8GuqLFBx0naWLuEwsC7Fk/lm/+6B0yzl1p4S624VEQDNLovJSfEwCpFNfeOFCzBqQ6IKgKUcf0ijF+QL4da3wfk5EkCVk+Jx7rnJXB2mC2//79gFmDycPf/j7lzO3cWQ6sRtY/Ze07Y0Cn93XZ+iuGQLeNQaBRlCLZS0H1t1zrWtmEK/Nq7++lm+3/mKJtA+Z6nAjB9hIDnRNI5ofJQ6wbe1wQY2TMSMAn3HmpAoLnjqhwYXz90eTuV9ASjdIB0LcOexQkgrxtWMbobeMppS0dZOm22jctusj0MhokG7DvS507aMIvGEzStT2JjSuHbYe/NUeYxKm83NtcLn5vN/VS2L8q5kQ23mHkGMGyVpNOidk8ozkzdnzBqizUMMr2uD0Awed7sAeGLiul32I+/X0sYINLzhOKLm5I7Brb3inPOuLin/RhAHkaDe96XqHXmk1tfPsSFDAooBrBiG3w2RLQHm2cJtAIjOrL0rKHpzBj5tEr4BBwi; 4:FUZBZX/iA9q+bp67rA69OuyR/VtlroEN6aOMCQNzQWtYwWGg1YAdwcRtjLHk8lRIRV/4+mT7O1SRKMwxLIwUCcDBrqggvap5Fx+ahjorf0UUfkExVSFw38ERTrxCctnkfwKzC4iWnRSJy9QY4Pld7Qk8F7/H2XQUtiy8cbuF/Z28oj0IXRphj0EorppB6rDTuNFcdFtolNruTVBPi7S463pwVqs4FutlIxSBEalB7lljqE7HiGLIvcdeMZUrbDfe0KNN0/i/g+LTgXKR8pqRBw== 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)(10201501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:AM0PR05MB4180; BCL:0; PCL:0; RULEID:; SRVR:AM0PR05MB4180; X-Forefront-PRVS: 0694C54398 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(39860400002)(396003)(39380400002)(366004)(376002)(52314003)(189003)(199004)(2616005)(956004)(6666003)(5660300001)(118296001)(47776003)(6486002)(486006)(476003)(50466002)(66066001)(48376002)(81156014)(81166006)(86362001)(36756003)(68736007)(97736004)(8936002)(305945005)(25786009)(386003)(7736002)(2906002)(478600001)(316002)(8676002)(16586007)(58126008)(53936002)(106356001)(16526019)(105586002)(26005)(51416003)(107886003)(52116002)(3846002)(6496006)(6116002)(4326008); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR05MB4180; H:t540p; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; AM0PR05MB4180; 23:ZZdN/ex3RaQINJhhFGhCY87Eh7DDse1HUw7ERE4DrWzpuMIP/Kpr/1zAQYNynZuN4u8Uy7yFno8kCWN7Gesdkxs5nJfX+rE2aW/Soc7YE9utAMhj/P1iTsvoLgfGhA69nfET0Mws5bspuFhVkbw6iqNIpvogFBxQOzps9lG7Z1QMYEePp27s/WOf0yhOru/j3L9leZW2xdKKwYT5fOZGMxCUXUj2niGJ6MMn12lUtfdVM0NPeeg0MQljKv8L+v0xJdh8dCBOG+3b92xevUej0j2IExn6/MpvwZqsmH2VAJG8JrPUswIBsr8dufrGAp06gys46wuJaV76cEQzzMpfF8Bb0L+pyt3MDKsIzmSIY0jc7rk9rdlCKWTmgfcP1sWB2F3nXac/MOQc8gIMgHiaK3lYq8LDkW5YQIh60FYrc0k1Y8ifupZmUYlyqVJemTyUstPY5safw/8v7UWQ/wyh88xrAtTBPkSA/3IlHLulBa0mCga6nj8Ikj0gVV/kBBFfhyKbnaf25+fXSnWu+1atlcbiZVHR2ebWw6tEA+Six3gCYyH3azfOhPBYS0QzQxlz7FpLrJ5YRjXbeNOUAXTGyv03Wrk/T+rvp1RyazI69mP9GaIZZG+Bgxqf/QLQFxtQ4elF/FkF9BcaHrn4J6+244wH9HnG+Lcp1VH1Qg5ZQ1Ksb6vSz/wAx0ujEuCKXESCM1vjvtAGaDvaaJoWHGxtPGIEKVGEGkVZrsydY57OmgrwkNEgXrkqIIvT+sRA2CMnpHQBpNcwiIH25m9hmsiYfanIufKJSSTUoICw9HZlOi4xf1ovU64nVuCnH6EHjd9LhK9xphSt7pC9z4F0hSnVqNyz9MLuzrPfRvPKCK9pulx83UbBgp0JtVw95n/fC7EbPaqN1T9lNoKTxQFXIOZWs2BjjNV0aUzPt20vXCz86OV6VOqmCHNb6vpbCyBnKAg230HsV/RegW1sehZRL/nP5WIFNTSEKR6+NVVKupIIW+uAX0mNrsqU1j6hhIQXfTCXlVn0LbQkUx3+2O+PxOaxBupCS/Y0npPPq6LU59YVXKI3GOElE9x0ma0MsdjQna+2RYwJQFxirXDMsRYI+nLnafWO9jIGSwObZRxobCLmuATpxP6RJXv4yqqyC2d8XpNL X-Microsoft-Antispam-Message-Info: yZfC2o6UNEqy2VQ2tJiyJxDXnAbeQysJPYVRuq8d3YSz3SAIWTWCusiIxjM+zHn8cr3Cy959eYvXDywNi6pRrI1e5U4J6g5VTL5RG7lIKQwuIlOlVzP9iANMSYQwZNNhVVIf36QCXCqJFcc0zRiWJDc9AbpLw1jsVISLNXhKUlujQYf+mlX0vdznSGECcUwE X-Microsoft-Exchange-Diagnostics: 1; AM0PR05MB4180; 6:iv8mJPGcbP3X8zTuPO/3gSX95f9VvOfxDMY8GWxKp+nJt9uRYrfGMRRkZGzB5iHUSG6LHMzLPp03DShCF6iQKmz8NEvUBwwZ+PuTJsjhx3CEwbAEhyxQDTezSbeYJa+pRVngnK1FPQ9Pmp4Vj9pkttzSRkJtLD8n2TEIhNbpQSvLbk4huBo3GlVRQD9LcDB6GdVlgC1y5TxIInby877dW2waXmkzmfCeePMa+R8B/kcVGH4AzVP3fbgdpF1aH5SQz0J8bz5BbXQRY1PaTOpsSj8WwcrEqAwV3riUlfUeLB2PNGtUnE+HrGoehWHBhcWxUaPb6u6AXjlDEs0oBdzB2GIdyTtPpsKUUQJ5r9kpSqpG6yHPEFZv1XO7Up2cz0C+z4NdiMQrUuwE0ldTg3nVIv1cGXuva6HDvwdQpTEL3vtKigAsq92pwTdOaot1rR0uuLhjhs+nNl9ps2s+38Fe7A==; 5:iey9xfVfiV9OGA66voCp7URJe5/FNoHIokpyxsdTjk7owpveYORphOIAganTzXoqYMkled7yKhFbXEunaEwU20rDVi/tpGY0ReXQiI54fpMNyN0fOGbcSdNxChLGcikJJGw1J0VHGt2Fq5B/JHc/xjpEgn5j3ETnJsW3PcKmN6w=; 24:4IRwWGwdaoPYa1hmFHvnplok6vHGZ+jiIWF5WQz1bi6HM+QxHtRgfPm3Sp2bjZFOG+GFLbZQQx8BUbQWd03AR3zoAKIsB1eb2xemrmixm7Q= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM0PR05MB4180; 7:OvrHFhmenZdXZ1PSlbigxM93VMrgyRLchYvQ60vdx/Lg82XOeqoWv6isJTkMUGv5ja1LmEx1rV9Qiz4/4c2A7ybojj6MFUXlNnfm7/HHj27DNfQMzel0O7LLkmyemJjrYcD1jSQcMMbkU50fQbqyPjR5qV4F6lZE/4lfuue9I0oY5dr1wfjKhYyaM1a9iVMTOGyJZcF37g5n/30M3yQeJEsm7s+w2Vb5o/zMGu/69+e3dn/R/RA6bDgbWjbx7I6k X-MS-Office365-Filtering-Correlation-Id: a80e2595-2e7c-4ffc-c4fc-08d5cae5442f X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2018 13:07:17.9345 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a80e2595-2e7c-4ffc-c4fc-08d5cae5442f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB4180 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When libraries are sourced from elsewhere from the tree, such as the testing/selftests/drivers/net/mlxsw subdirectory, sourcing their own dependencies directly by name doesn't work. Thus running mirror_gre.sh from that subdirectory results in the following cascade of errors: ./../../../net/forwarding/mirror_gre_lib.sh: line 3: mirror_lib.sh: No such file or directory ./../../../net/forwarding/mirror_gre_topo_lib.sh: line 36: mirror_topo_lib.sh: No such file or directory ./../../../net/forwarding/mirror_gre_topo_lib.sh: line 80: mirror_topo_h1_create: command not found ./../../../net/forwarding/mirror_gre_topo_lib.sh: line 81: mirror_topo_h2_create: command not found ./../../../net/forwarding/mirror_gre_topo_lib.sh: line 40: mirror_topo_h3_create: command not found [...] Fix by relying on $relative_path, set up by lib.sh, which should be imported by the test in question anyway, and source the file using relative path appropriate for the subdirectory. Fixes: d5ea2bfc806a ("selftests: forwarding: mirror_gre_lib: Extract generic functions") Fixes: 74ed089d48a4 ("selftests: forwarding: Split mirror_gre_topo_lib.sh") 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 619b469..1388845 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 2534195..39c03e2 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() {