From patchwork Thu Mar 1 13:24:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 26137 Received: (qmail 83210 invoked by alias); 1 Mar 2018 13:25:17 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 83162 invoked by uid 89); 1 Mar 2018 13:25:06 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.2 spammy=$host X-HELO: sesbmg22.ericsson.net Received: from sesbmg22.ericsson.net (HELO sesbmg22.ericsson.net) (193.180.251.48) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 01 Mar 2018 13:25:04 +0000 Received: from ESESSHC014.ericsson.se (Unknown_Domain [153.88.183.60]) by sesbmg22.ericsson.net (Symantec Mail Security) with SMTP id 7D.94.18296.D2FF79A5; Thu, 1 Mar 2018 14:25:02 +0100 (CET) Received: from ESESSMB503.ericsson.se (153.88.183.164) by ESESSHC014.ericsson.se (153.88.183.60) with Microsoft SMTP Server (TLS) id 14.3.352.0; Thu, 1 Mar 2018 14:25:01 +0100 Received: from ESESBMB501.ericsson.se (153.88.183.168) by ESESSMB503.ericsson.se (153.88.183.164) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1034.26; Thu, 1 Mar 2018 14:25:01 +0100 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (153.88.183.157) by ESESBMB501.ericsson.se (153.88.183.168) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1034.26 via Frontend Transport; Thu, 1 Mar 2018 14:25:01 +0100 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; Received: from elxacz23q12.ericsson.se (192.176.1.82) by BL0PR1501MB2002.namprd15.prod.outlook.com (2603:10b6:207:31::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.527.15; Thu, 1 Mar 2018 13:24:57 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH] Don't redefine upload/download/file in gdbserver-base Date: Thu, 1 Mar 2018 08:24:43 -0500 Message-ID: <1519910683-11571-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 X-ClientProxiedBy: CWLP265CA0021.GBRP265.PROD.OUTLOOK.COM (2603:10a6:401:10::33) To BL0PR1501MB2002.namprd15.prod.outlook.com (2603:10b6:207:31::32) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 64c7c587-10b4-4f5d-1da2-08d57f77d494 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:BL0PR1501MB2002; X-Microsoft-Exchange-Diagnostics: 1; BL0PR1501MB2002; 3:6JQpT7L1FkTji+5lRa63piwuZFgHirk8X2T+d8XUzmQ0WYlXKUY6C3VLlwHVoAi4A/r9n+KyQsCN3YWGvRgSm8mIOxNYrQskMKwSQ0VyMIVhmBrFFG+Yol1BDP30SQPvOy5WqS+xs49DOy8axR7Z2dznSbd9oAeT7eTtT3Hv+FeE03i7dG78rayuxnplLBqPrGeNsVv44N8kdby3sae+mQR5rOgzSPTSkC5YTc91kU6xoVg8pzt4T5ky5aZhW/GL; 25:Z2JF2+y7sOjA8Mi/SfgOm1V0juDXlJf4MUFxxHCbdTaKnpCXpTJ1oViwYBXWZdNnV/asxxDIKRsb1GrXP85m33/g0aWYJ6HP3840k6w08wLOMDtRFlKjtUkTGcWZvU8lUlkn/Hv3SqTelJGALvS5hHzOYUFuFLOWlxXSoyk/7gswCA0C/zp9BdW5Yo2MwGLbEcYtRKtexBW4Ppsy3lSICfK2Kkh5PeG/10ORG2xvynkEa8Yu1/XdZA+cNcwuCloqVGNYcPvczJU37gekVOYHjvonxMwPypTVzi1eJjIh4RRXPJeI0uqqiw5ng8m8cOoo+2gI3pQ22P0BvqU0LI1S7w==; 31:jmGKaenu8biYt/nxTt3fN/JN96m5A6bPnBJZ5bEPGKqAyPiAGVY4r/7YjS/q2ftNOzdw0XsegNP2psyOMsmeFU8ltmqSe6LfOUxOdpgkrCYFZSlyOXr7oD/JFkDdGgoK99LH7kwF3svLSKQwCZgvulIVEIqSPS5k7lK5UNw52OfsJ5fUjkbb6MX1+7PQye+u/lSg1Yfpi+t+9FYoILG3hEqhUjW+zJhXJH6kL9//imo= X-MS-TrafficTypeDiagnostic: BL0PR1501MB2002: X-Microsoft-Exchange-Diagnostics: 1; BL0PR1501MB2002; 20:nB1e84gcoDwhUKTYIkuTbBYw02rL5nzS6TYmVgUoSUW0iCG1qnC+kUGSOFIDyD/YgJQE5Duc773oT/E5dZ5Es6nrY3ug7PBW1+gHoDHgxAthVHJ9JO2Q73Js5Vk8jumD7T+isxSZGBITW5zrk3E9Eei8GqSo3D9RzN8XunP1GRxpZ8l3Hf4J0ISuii7z05/+vtmJQ0VbuaL4VKqzU58aprMw2eyLVzHc62b3N1GAQzaPMHxzUQfwHKjREZSlZ8Dg2bTwCr3R8xzeuou/sYa7L6yvHJ1dNCIO/tCJe8Ek3GkjjgTNxlpq/C9Mfxr7Qj4ILhAVR+wYKbEooCe/RWDjzo7Z6MQD4WM0JGpR9LBlCxQ7TwG7Uj4gD+1Ft9krSVNClja0ela8GRdMQBITQnDcpwnL9HKc763+UHjM25HJV6sNPhPGOTKM5d1jASoJhPl8SoU+WjqJR8/9kB9Or6ObvkUgCK4GMYd73TkuTtQfWqPGYy0T9Kmm/RDR6wYuscNW; 4:+HkE38Ic+rjRivUMqJ3ILGNYsWn9kHI0glF1+jOTVlrCNf8KFUyGkqwznXLcZCwCWQlEb030KJQ/hOx1Iy4wJ8OnKiuU4i6EITnRJbei79RFuLjEvfWrBxrW8H24Q24YPpaRpWCopxv4d/1DqLrp6HMJyxI3SesUHio/YMuNovbMxOdB14i7Uh+x6PsSowwWKN1WFsgu52YO7ZXzYQ18f3nDDrrJ2HvxOJPPbjVj3tscihUDOA2YNKtQT01ppvPTwWRzuyO+UDFlHgDHE2u0Rw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040501)(2401047)(5005006)(8121501046)(10201501046)(3231220)(944501224)(3002001)(93006095)(93001095)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:BL0PR1501MB2002; BCL:0; PCL:0; RULEID:; SRVR:BL0PR1501MB2002; X-Forefront-PRVS: 05986C03E0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(396003)(346002)(39380400002)(376002)(366004)(189003)(54534003)(199004)(50226002)(5660300001)(186003)(47776003)(2361001)(316002)(6506007)(106356001)(66066001)(68736007)(59450400001)(386003)(1857600001)(50466002)(36756003)(8936002)(81166006)(6916009)(7736002)(16526019)(2906002)(305945005)(6116002)(2351001)(26005)(4326008)(25786009)(69596002)(3846002)(53416004)(52116002)(6486002)(97736004)(105586002)(8676002)(53936002)(478600001)(48376002)(16586007)(6512007)(6666003)(86362001)(81156014)(51416003); DIR:OUT; SFP:1101; SCL:1; SRVR:BL0PR1501MB2002; H:elxacz23q12.ericsson.se; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: ericsson.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BL0PR1501MB2002; 23:LAhPf/Uj73Lts7PGNmsyzlcGpTRPaj5OMiHPzT9?= =?us-ascii?Q?4IJkMmyc7wP/H7+lK6ZD2DZIeLtkZZWQoFVqjeEJOPPmVEuAcCzxh+FeNokt?= =?us-ascii?Q?t9sy52ZvCuUnBhiA7BfqxLWegSuJMTzrlypoM3WVAbmrNOIT7TfYXGRrV/Al?= =?us-ascii?Q?LvwOV41AbbFyVGo6Ot4wiV6FmdTqPdPAYdnou0zAxyTxel+WGuIDEwOErnu9?= =?us-ascii?Q?den5MBhNnk8RiF2r9X/hJ6OCuJhdYzvLY5GsLAaGjZupKUqMJaIeMCTXJVzS?= =?us-ascii?Q?Qj8672VvJYcbtp9a42YPw5pl7Q3nzFUaQSPKINShAkvCH0DAjE0C5VXtHMKm?= =?us-ascii?Q?UBNwTAZ/6NkI63iqCFp0HrMXO75DWbQ/2Lku1r2WUSPlElP90zFF5ZCrY2xH?= =?us-ascii?Q?xAsL7mMwVm9OfJPBRB7SvsDpbD/UxHlSgHArV17U2pOugNBHL3Hue6ooS1sg?= =?us-ascii?Q?jsDZoUIsq6vyg36zYF5m8x5E0EZ+LQLVxXORqveXs5yrJ/lYIJc7JXnR0PSq?= =?us-ascii?Q?L4rJz7d4ALrnrRKZvTWCpp/Wgn+zM7jDsHoKcKV9BKoUz9lUySjBYJ+ED04w?= =?us-ascii?Q?QF56/Qu7tjFOIXKzFOfmv+mSChDHEiFO+YtoJ+D4p1mfAfD1FYq9zvKXY3Nm?= =?us-ascii?Q?0kcy030Y/6XLyz08HEQg0f8z6w5kOy5n8Sd1v7MzerpSRyhBBf+BkmNFjZ6r?= =?us-ascii?Q?lia2RNtL6V+525PVxrOkRnfEsP/zCsWsq+8ubcezeymyI42dm8lgiOtu1h+P?= =?us-ascii?Q?rC8ObMds1QmMyhItdOmsms1t8T6axNsD6uDd7DJWnqqP/XaGvNPR+3iMKUpZ?= =?us-ascii?Q?aqCX6eCLUELCQG1eZAb/riiL1efJHNG3avn5RqqikzGjGt2cc8Atq29Ehtjv?= =?us-ascii?Q?8MQpGMCJWf2Wse22RLTfotAKvw1IZKWeUrEi9K5aoN04b4R2DsO6fOXiqxIm?= =?us-ascii?Q?eqCmkfhCPeNI20uwogMbzB3rc6cNj2pq+wNyeJF2kGceOCmnF15ok2wDGcKy?= =?us-ascii?Q?cY/TpxqicDkQjr9kB+VQ5PkvKKk+Vx6KaqCmVoQ3Td1cMlwXb4Q/Dd/uyxzc?= =?us-ascii?Q?sNHaxdrKZJf0kMC+sF5vd26VQGoR1nA815uDrWG9L1fkwJg7y42a7F2c642Z?= =?us-ascii?Q?5xsgXikIAsB7DKlb04AB0t4l5KRhU+glgEneEsm20pVrTNOiUJR5uaTWHWCC?= =?us-ascii?Q?esv5FWpZ/VSN12ZkkSNb4bln63qBngKw/Ofce?= X-Microsoft-Exchange-Diagnostics: 1; BL0PR1501MB2002; 6:8nGR9wBNzCKvo01qDW8VvYsrA/fDzEHvsIl+/yIIwvP9dSEJnJ7WK/zoDLJrK99RsQRa9pk5M+7PfuEBJGz9Yn7+Hm8XWp04dzD5yQ+4sFAplboeMSw4ndqe0uSHFMEYUisRXOz9rIFMp7whs+e+Gav1fj9neCIbDOf269u5qJUBemSz5AvuTlrdu25ZcC2pumnA5I3OOQjraHmjxess64dQjSNdaK9W9yz/N+D3hOANUbvmKgln61o9w3iEXCbNivrqKC0dIRYJX2KHYC6QcjuWRVi26p0nnz58tMWWj6zHDMbBEjzi8VVfWnUOwJYRGF7WtdYt8+JD/o7prCedcUSuGdFbOKXpx0SGbbeu4To=; 5:zSvYfBgQhsafrmYZoaicTIGbtWZdCgWWweOzoELDyeQMf1wWNzzstRe/svfBJCwhIOKZBU4PUGvSVjj1GyQLX/MmmzR8gKNmas3R+dm2kCts7hdsHe/L3XGzvqSGFDuqR4Jrtn7QFRKN52AjINEECONmEo9Pzqc5Gz6OlHeYbPg=; 24:CvaWsfnAa5ww8hhcRQdI7qOoakBZaw42eYBmhtn14/bRo9Xp09wH1xfn9N5JJz1hH1XOthquTkUy48ab43k2WRpBU1PUIHDu+7YAfBFFt7Q=; 7:eJuOAHePp5pnT8QGgQEYqKMHJiuqEPX+f4HMua5SB4epEfWN+RKDwrTtcNsKB/N5MXg1s/Q0lXLO5foEoilHAdTd9TllOcLcvxZe7AClvUjZp1e8xmDyXPkpZLMJ21J3fcFOKePt5BQ9qJDpHpjyAS1vseSAb6acT1/b4mN9kmDOer55RHExppHiJoQAbUb9gs/T0JDl0imHK/hKCJ2DglZLOkYFfz3wJeGdjsSphDzMQIGimHP0g6vCi+hDeqmo SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2018 13:24:57.5855 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 64c7c587-10b4-4f5d-1da2-08d57f77d494 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR1501MB2002 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes From: Simon Marchi Before patch Make native gdbserver boards no longer be "remote" (in DejaGnu terms) 739b3f1d8ff7072dcc66240c25b026c6433bda1a the local gdbserver boards (except native-extended-gdbserver...) were considered as remote by DejaGNU. To avoid DejaGNU trying to use ssh/scp to download the files to the target (which is actually local), the gdbserver-base.exp file defined some _download, _upload and _file board operations to override the default behavior, and instead just use local operations. The same patch also changed remote-stdio-gdbserver.exp to make it inherit from gdbserver-base.exp. Since then, this board (which is actually remote) uses the overrides with local file operations. As a result, files are never actually copied to the target. I think we can simply remove the overrides from gdbserver-base.exp. Because all boards should be properly considered local or remote by DejaGNU, it should by default use the right method for transferring files. gdb/testsuite/ChangeLog: PR gdb/22841 * boards/gdbserver-base.exp (${board}_file, ${board}_download, ${board}_upload): Remove. --- gdb/testsuite/boards/gdbserver-base.exp | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/gdb/testsuite/boards/gdbserver-base.exp b/gdb/testsuite/boards/gdbserver-base.exp index 2e97697..52ad698 100644 --- a/gdb/testsuite/boards/gdbserver-base.exp +++ b/gdb/testsuite/boards/gdbserver-base.exp @@ -32,25 +32,3 @@ set_board_info gdb,nofileio 1 set_board_info gdb,predefined_tsv "\\\$trace_timestamp" set GDBFLAGS "${GDBFLAGS} -ex \"set auto-connect-native-target off\"" - -proc ${board}_file { dest op args } { - if { $op == "delete" } { - return 0 - } - return [eval [list standard_file $dest $op] $args] -} - -proc ${board}_download { board host dest } { - # We pass DEST in standard_output_file, regardless of whether it is absolute - # or relative, because we don't want the tests to be able to write outside - # their standard output directory. - set dest [standard_output_file $dest] - - file copy -force $host $dest - - return $dest -} - -proc ${board}_upload {dest srcfile args} { - return $srcfile -}