From patchwork Thu Nov 30 16:34:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 24635 Received: (qmail 94625 invoked by alias); 30 Nov 2017 16:35:19 -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 94613 invoked by uid 89); 30 Nov 2017 16:35:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KB_WAM_FROM_NAME_SINGLEWORD, SPF_PASS autolearn=ham version=3.3.2 spammy=boards X-HELO: sesbmg23.ericsson.net Received: from sesbmg23.ericsson.net (HELO sesbmg23.ericsson.net) (193.180.251.37) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 30 Nov 2017 16:35:17 +0000 Received: from ESESSHC012.ericsson.se (Unknown_Domain [153.88.183.54]) by sesbmg23.ericsson.net (Symantec Mail Security) with SMTP id EA.E8.08439.243302A5; Thu, 30 Nov 2017 17:35:14 +0100 (CET) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (153.88.183.145) by oa.msg.ericsson.com (153.88.183.54) with Microsoft SMTP Server (TLS) id 14.3.352.0; Thu, 30 Nov 2017 17:35:14 +0100 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; Received: from elxacz23q12.ca.am.ericsson.se (192.75.88.130) by AMSPR07MB312.eurprd07.prod.outlook.com (2a01:111:e400:802f::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.282.3; Thu, 30 Nov 2017 16:35:12 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH] Use boards/local-board.exp more Date: Thu, 30 Nov 2017 11:34:54 -0500 Message-ID: <1512059694-18986-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 X-ClientProxiedBy: BN6PR18CA0007.namprd18.prod.outlook.com (2603:10b6:404:121::17) To AMSPR07MB312.eurprd07.prod.outlook.com (2a01:111:e400:802f::24) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ccff7f76-3114-4e81-e367-08d53810544f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(5600026)(4604075)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603286); SRVR:AMSPR07MB312; X-Microsoft-Exchange-Diagnostics: 1; AMSPR07MB312; 3:GwYxch9WK1frCdUpVAo2ZwEXU4T/A/abGKVZWJzuYtN0X+2/2jljv65oVtNpfm+EsuDfFv08mxpHE01wTMLROvrID0W7e3ZBp83kdatjjQ1xFskGM8gkTyF5/JGV9bYba74uIr3jEiQN7shP2isRNeE+Zg88ekk3htUa/yl/IqAU0oK/JM44W+kaHP8h5/U0NicKso0TbsEbgcZrKIR3ZPFMWA9YQp0Z1jqpUpBre+25rMO3LVsSPmF+oyU5n7K8; 25:QERHsUlcWBYJ0+lqX+5AENvuEML9mwHim5NfY212zRJQxGnxRkbvUnVTzbZ5Ebn0WJ6R3TPVn7wtw5Ho7FH5gvTZy6ZqSvT1QzSvuQdpaMwlrs/YWxvZJIySdkNVdmufrBAml06Ca2WtM4dE1Wyv/tkNnyZtnkg0bl4/cIWB7SfJi67MYw2erUEbQuG3LTMqMHprddLz2AaNR84rGXbfhas+9zocUL+TyPR/0xgfbHR12luNyOk7VdCmYO48FFkqo96Yo0webtF5i7xxaeCLCkNSSgN1l/oEYzIzKHE9IYtKyhjWEvJ8bgOzI6QqhL2is4CKFNUVs3QGLxzZROhEng==; 31:Jz3zx6CuImJo+aWLYOdlTsmw72rZRtk8wKw3kJSqCSAryu5sHes6MdmC2BUItSX2PKOoXMPz+yMvelnKYIw7Y5aF6fXkLXWl1zo1EGWrgeGjUG38Nw+MxL0/GD1UGQsiUh5IHtCLRI354k7eRy88GPmfPkUGX93Y6G4lp6X6AZNDtT1rG/lDVcIdKFA/roOHOPG56EsiiSSGRa0VErsbCdTgt0P9y6xVEXrKBZxgbpM= X-MS-TrafficTypeDiagnostic: AMSPR07MB312: X-Microsoft-Exchange-Diagnostics: 1; AMSPR07MB312; 20:8CcnGdv+1iLkFgcgJSy6mkulJLwZOogFkf6Q/ZUFV3ed23od8tmqzbC3RlbcN2JIqBX3huNICWR3GC3oJ9Qzyo8Rq02mjs+WudqApbN2UM5eVBUPUk7KQpwHSr5qFgdy9pz6xEPsv/gdzeGjSYBlND+ouprl7uuVaSadipg7jBhPc5S/e2p8eR/4SLX0RlAvQN6w7rraZMz9g2EV/0ooTTlQa2FUOtSYA4rrcq8I4esbavRSJbQ0JrUB2ZJR1bFEORKh1c3cdmcu5LPAVdrl9Vl7XzlpmU+vj0v7m2u2Sm3u0c2RMRdOgFk7YM2mGtF8/Y/y9MJHCoG55EkBfq+1U81Aqkh5dr9HzCkTsoM0EwiqwgbnfToKR3LMugy8lwlFqvRIQB9ZkaFsyIE9A8UuSjxGjAI+DaHGqSeVbrhFk1YZjucrDzVVf3siw+8yOHGEGJFVMS8R58BQLHrNndSnprniQOlYfYYAEkklGRCXbwImLwdELwM2naTBuouP6XCy; 4:1DfaoQMbW3swiHFMUSjJlQA4uft6eCruFCtkzPZQGXbq2FDdMOiMfGlUTgpoxe4W8H3gXENpkOdZHg0yIAzWFfPjx0zCF8s1Dn1ZYfbKCpEQ+xE7T5miecPGwRitRKEgKbhFyXpUXNckkGKWgW0k2HhqcF2Va8Fy3NrAGnpQlYs7vhdza+CupOId0/4rsSxpJg77dSXSeD0HH0hIgmDtkyv5kD3HJPD1RfK1xbbXzqwJQVJQVCBGT9m4hP5YrHabKFuxZ/Y/Zao3Lh2KRVm+yw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(2401047)(5005006)(8121501046)(3231022)(10201501046)(3002001)(93006095)(93001095)(6041248)(20161123555025)(20161123558100)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123560025)(6072148)(201708071742011); SRVR:AMSPR07MB312; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:AMSPR07MB312; X-Forefront-PRVS: 05079D8470 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(376002)(39860400002)(366004)(346002)(189002)(199003)(54534003)(5660300001)(6486002)(6666003)(66066001)(6506006)(6116002)(8676002)(8936002)(3846002)(47776003)(6916009)(478600001)(16586007)(305945005)(105586002)(316002)(50986010)(101416001)(25786009)(81156014)(16526018)(7736002)(81166006)(2906002)(97736004)(68736007)(106356001)(2361001)(33646002)(2351001)(189998001)(50226002)(48376002)(50466002)(36756003)(4326008)(107886003)(86362001)(6512007)(51416003)(52116002)(53936002); DIR:OUT; SFP:1101; SCL:1; SRVR:AMSPR07MB312; H:elxacz23q12.ca.am.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; AMSPR07MB312; 23:cA/rovdhCyprvll/1Y+CL4P+WOsE+Z7WkAdUUfGYws?= =?us-ascii?Q?+o/CAuHDy8kEgGAOsynjVPGsoaUQ7HEIcEeg0x6itYLm/ZOQdwp2Pm+W4w9K?= =?us-ascii?Q?ajn/UGpbzFx9ftsIsbBdRy0iuwe7C8eCQLlYPqXiYM3HjteYAAcbgacuTqwe?= =?us-ascii?Q?ZZWteQPrNz7UlQtSP5dDLBfBySaR1y/sNMHYHcqf+V3TnObpisYjUb/woqPA?= =?us-ascii?Q?SWEGfgeeqyGakZC26m0xgUo+sYVfmaYJlNBarrtpjL79GVXmhEjDWkj+bGuk?= =?us-ascii?Q?J2rH4NjDjIfj6gowSZ0Q3btWm1XKOzu3GcqZ02lNz9wQc4PP2aFe0Jy3yqVh?= =?us-ascii?Q?x9LFLg88YwFaqZCluZ3wpg/7+jN4fg+z+oqwH4ybbVjmcUMpu2kk3B1Ra2Ng?= =?us-ascii?Q?L2ivekXqV08V+Wc4KeJwf7HwUOlDCVG9C4+oEHr+/jAj+9VRlPKms7BCLzb/?= =?us-ascii?Q?R/oNEfcj9q6aMVqwYG/EGfeCb3LyqDKJ6psNoDa/bcntIWVXot6Kat+iRpJe?= =?us-ascii?Q?TWIMBMsqAl85GCBgfBgTepi1p4jlUDBPT4b/F12MPFF0Uz0FaBHUcHu33yTB?= =?us-ascii?Q?JPxCD7/z9LGX7+ETUcicpzHB6wTLFJsZqzLn7VkUJyJCGDSIDs3s0GyAMEMB?= =?us-ascii?Q?UQ+CEyUCqbmjRBFz1tKpqdPcyFEg3fUP9gtdiEl8fdnOjm9VhVrtR0xSXFcR?= =?us-ascii?Q?syTVEtXldsqtap4S4lNBW8dQ374YpQn86cVhnoibFbvKgKKQ7zhzIGh37080?= =?us-ascii?Q?NmlIUUdOXb2uKiKlKOyEnPVN96e0ZahcISYWCDLVmgnW4cCZPbkK5cW9uGZa?= =?us-ascii?Q?evjznvjY/sHizlRZw/F22tcpRREhz/PT7c9JKjxf03TJ3Int6BgK8tR2n60t?= =?us-ascii?Q?0ZDn3Ni75CowfbDOJoqM9PHCSHUFBt0Ukkl0JhgWhXyi94Rr0xv0Np90qJJz?= =?us-ascii?Q?THcBAeD+HsFyZjaNBYpZrHGJa5BuqUDHsmILosb6XOV2xLLoMUSY8Z8YYflw?= =?us-ascii?Q?g2JqpPYgniCTlt4hjLqvV1aQCapaJAa+E4rCjUou7RnynhmHCQvB/ODWiWGL?= =?us-ascii?Q?7dF3b/5Rzjqbi5WpmPkp8Jc6Pq4R/2u3lHsALl4i49lK67ydG3iijbxkQzC1?= =?us-ascii?Q?Z6rceZoTu/X+C5hXQrLEGbZb74vbh+h4FQB1COOS0MwxKNMOLXRg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; AMSPR07MB312; 6:WtOAbGAfZa/if7Mo6fbAmYsFBMNwZNd2ew5SVSH830rbvNkSoaDSL/eLt+4zW1PBgPC4uKkEQhp3l7tdBcq8l/ymv/bR6NkcNbeXY3Zv/L4qVSHKGrGe5gwP2pCzoHsTZFkIRqSZJbKHECavxgW4AJC2eaG5QXLy5DnSWIqrhSmOlnmvRquvGd+Jh+ErxO9Z6jsid2Bi4tyETa+GyZfu1v0TMV+wCOntZkpCoiPGbFgOR5KTIqN9x7e+8JKNid8e1wVXNDWQ62YeY0ujo2ZA+l5IWeb0scf88Eadaf0i2RGU7zRff80/QMPUdFXSTT2MYdEHyk/13zdaTf6cjTkKKs4XFCr3OXt3RECMxaAnaaM=; 5:d9Hb3Z1Lt48rob/MPGRtaOq3f5UXUuVsqGHvURSetfNo715UUE6VIGeXynqDluh1Mq1L3tgQkKiyZFGBocCnj70ZI2rDUlAIVGqMZB7QY7QxvBy+brPSU274tpv7P+/MmD2uoF1h9o8qtqzMzqhVYngCSq//r2J6OgMQ2dVfoDg=; 24:sUDnZKuXhZykvUC/zr5bbJRwvvPC65GxGrl6Ekt4ytlPGB8i0y8GUt/cVTJC2QdKojoJmGCjPVLV9u0xTymHLIfsKsOCgM7N4sSiBWqXTaQ=; 7:kG9gVPDU0aJoFY4rc4yV7hljyaFGvNdFXYUs+D56bK+1HJ8XCRcAno0qOiUm6ixywdPdKtzNSkp9R1idMP2Qla9FpPelMwePoq/nvEyZ7dBWt2eVFm4WwwtEd48rq0O07Y0sUGMjNbLZW7AxhgsB6MsRYRt8wwlL6L0HK3mscgPJlZ3Q0FiKNrwF9KG/GieVeid2rAPIx8j9glIM+uBXQrZpao0/elB8iCDX3zhY8vB/wcAT8ubD3htBl7d2SNFm SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2017 16:35:12.0134 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ccff7f76-3114-4e81-e367-08d53810544f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AMSPR07MB312 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes local-board.exp was introduced recently, containing the code required to force the gdbserver boards to be non-remote (from the DejaGNU point of view). Other board files use the same trick of forcing isremote to 0. Instead of doing it by hand in each file, include local-board.exp. gdb/testsuite/ChangeLog: * boards/cc-with-tweaks.exp: Include local-board.exp instead of setting isremote by hand. * boards/dwarf4-gdb-index.exp: Likewise. * boards/fission.exp: Likewise. * boards/stabs.exp: Likewise. --- gdb/testsuite/boards/cc-with-tweaks.exp | 5 +---- gdb/testsuite/boards/dwarf4-gdb-index.exp | 5 +---- gdb/testsuite/boards/fission.exp | 6 ++---- gdb/testsuite/boards/stabs.exp | 6 ++---- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/gdb/testsuite/boards/cc-with-tweaks.exp b/gdb/testsuite/boards/cc-with-tweaks.exp index 794217c..bdffdab 100644 --- a/gdb/testsuite/boards/cc-with-tweaks.exp +++ b/gdb/testsuite/boards/cc-with-tweaks.exp @@ -30,10 +30,7 @@ if ![info exists CC_WITH_TWEAKS_FLAGS] { } # This is needed otherwise dejagnu tries to rsh to host "cc-with-tweaks". -# set_board_info only sets the value if not already set. -# find_gcc checks for this, so set early. -unset_board_info isremote -set_board_info isremote 0 +load_board_description "local-board" # This is based on baseboards/unix.exp. # At the moment we only support systems that unix.exp supports. diff --git a/gdb/testsuite/boards/dwarf4-gdb-index.exp b/gdb/testsuite/boards/dwarf4-gdb-index.exp index 09c9c98..ea4f47a 100644 --- a/gdb/testsuite/boards/dwarf4-gdb-index.exp +++ b/gdb/testsuite/boards/dwarf4-gdb-index.exp @@ -20,10 +20,7 @@ # bash$ make check RUNTESTFLAGS='--target_board=dwarf4-gdb-index' # This is needed otherwise dejagnu tries to rsh to host "dwarf4-gdb-index". -# set_board_info only sets the value if not already set. -# find_gcc checks for this, so set early. -unset_board_info isremote -set_board_info isremote 0 +load_board_description "local-board" # This is based on baseboards/unix.exp. # At the moment we only support systems that unix.exp supports. diff --git a/gdb/testsuite/boards/fission.exp b/gdb/testsuite/boards/fission.exp index 1eb89de..4a62ed9 100644 --- a/gdb/testsuite/boards/fission.exp +++ b/gdb/testsuite/boards/fission.exp @@ -31,7 +31,5 @@ set_board_info compiler "[find_gcc]" # -gsplit-dwarf implies -ggnu-pubnames for gcc, it doesn't for clang. set_board_info debug_flags "-gdwarf-4 -gsplit-dwarf -ggnu-pubnames -fdebug-types-section -Wl,--gdb-index" -# This is needed otherwise dejagnu tries to rsh to host "fission". Blech. -# Double blech: set_board_info only sets the value if not already set. -unset_board_info isremote -set_board_info isremote 0 +# This is needed otherwise dejagnu tries to rsh to host "fission". +load_board_description "local-board" diff --git a/gdb/testsuite/boards/stabs.exp b/gdb/testsuite/boards/stabs.exp index cbf34d2..57de1e6 100644 --- a/gdb/testsuite/boards/stabs.exp +++ b/gdb/testsuite/boards/stabs.exp @@ -39,7 +39,5 @@ set_board_info compiler "[find_gcc]" # Use -gstabs+ instead of -gstabs for better c++ support. set_board_info debug_flags "-gstabs+" -# This is needed otherwise dejagnu tries to rsh to host "stabs". Blech. -# Double blech: set_board_info only sets the value if not already set. -unset_board_info isremote -set_board_info isremote 0 +# This is needed otherwise dejagnu tries to rsh to host "stabs". +load_board_description "local-board"