From patchwork Sat Jan 6 17:20:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 25253 Received: (qmail 10110 invoked by alias); 6 Jan 2018 17:21:16 -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 10099 invoked by uid 89); 6 Jan 2018 17:21:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.2 spammy=H*r:sk:EUR01-D X-HELO: sessmg23.ericsson.net Received: from sessmg23.ericsson.net (HELO sessmg23.ericsson.net) (193.180.251.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 06 Jan 2018 17:21:14 +0000 Received: from ESESSHC018.ericsson.se (Unknown_Domain [153.88.183.72]) by sessmg23.ericsson.net (Symantec Mail Security) with SMTP id 32.FF.31026.885015A5; Sat, 6 Jan 2018 18:21:12 +0100 (CET) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (153.88.183.145) by oa.msg.ericsson.com (153.88.183.72) with Microsoft SMTP Server (TLS) id 14.3.352.0; Sat, 6 Jan 2018 18:21:11 +0100 Received: from [100.94.228.101] (129.192.64.65) by AM3PR07MB307.eurprd07.prod.outlook.com (2a01:111:e400:881b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.1; Sat, 6 Jan 2018 17:21:09 +0000 Subject: Re: [PATCH 2/2 master/8.1] Fix GDBserver build failure when $development is false To: Yao Qi , References: <1515148494-21578-1-git-send-email-yao.qi@linaro.org> <1515148494-21578-2-git-send-email-yao.qi@linaro.org> From: Simon Marchi Message-ID: <090380b2-388c-2ba4-c7ee-d2a1f8e20e85@ericsson.com> Date: Sat, 6 Jan 2018 12:20:59 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <1515148494-21578-2-git-send-email-yao.qi@linaro.org> X-ClientProxiedBy: DM5PR1301CA0025.namprd13.prod.outlook.com (2603:10b6:4:2a::38) To AM3PR07MB307.eurprd07.prod.outlook.com (2a01:111:e400:881b::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2783c2a6-908f-4c6e-c04a-08d55529e13c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020020)(5600026)(4604075)(4534040)(4602075)(4627136)(201703031133081)(201702281549075)(2017052603307)(7153060)(7193020); SRVR:AM3PR07MB307; X-Microsoft-Exchange-Diagnostics: 1; AM3PR07MB307; 3:sfeLbF2Q8W4q1uBasmkwkDCvkwLXmMO/AdVahbQ/vs7gKl/XDVIu0CQF4TdaMc1BE7vgnon9E2ODGVcuRCFXKLEwxEXjL8rzQ1rvEB7AHutTxRC+nqin0o8wmIxDaYHBaTy+xmKoOVqmNn4tdHr506Aa+0+dOgCVqytpgP740fKxJhioC50RDvFs+F2TUri+rQ0yDalakVFXKCbT+Ij+85A+zivkX2muAB75OkHnGBhtN+NyvRg1xzxVykswWiCI; 25:FxyoWxDHoYj8x2X+qDeEMxhkZCT20429+7GgmIBMf9uCbau6OyBwnSi7IKYiGRfpR2iQKiulf5OK3PTZNQklZLTkBDdIbyMOAeiO0uj6pOTtGWT+Tw99nCTjhl6KPdrg5/eB+cvsAn797Jgr+WpdKzs35UxevxV3mg3I2ftdAoMklMZrrG4y2U4toUVNb6mq6aX8zUZWfyLYUcFrEd0YJ0S18mHQQz9ARxGmaiAfckpKG/sY6cAbU2Py30dMnK0P0qUIpPEyKh3oXbJcgxicM3Qmta4vQ2TzAjTjFcBI4WKqA8l9njKqw1XScgASLWHQ0tkhUk52tIFfVnaqoZ6EOQ==; 31:vsOStrIV19dLm/vhokkrVPPiK8CLV34/w11+heN+AVt0JQrrOUn33I7nMGnGGw4z/Wspc+nx5ZPFTC5nPHc3wgzamx0S/tIfVYwBv4WXf5/WXfhhgVEjPrqwaHzdV4PwdvKMRUdp47oyrAtyPKH5X+f6nmVengMxItq8iyrxPuo+lVTgRvaLrzuAs9+9MpviWe+0otRUcLJjh6q7+y631+V9fiG9GE0A0hKky3MlAzU= X-MS-TrafficTypeDiagnostic: AM3PR07MB307: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; X-Microsoft-Exchange-Diagnostics: 1; AM3PR07MB307; 20:ihzRttTwkiPOUmkHkyUjYmPRXQGVlEa/5C+uY8ZzNNyz9HermVYxKo5gWohnmgTDgXXsBylgT1tsYgpGuMd7kB8BIWZK1xqS2C8iYBy4i8XnS+MVmWePPz5cHqtvoUliTgzNTiEXTb8e9wWgXFt8j24KRoVyXXcjvxWqcLgbFTSThgLdLl0RNs051+beu3Mu2u378280zFzwV4DcPhTZ1ojAe7z5IUT9PrXzGtd4H82bIpNvNHP2OegLh87Cz8yZBTrWOmgIUUr+vAtyzaPjyLIIjhwuB30/c2sPgdXj3joqldXAcry9Ikz0+KdZMewEvDB0ovTTzSKlvT/fp8GxxNALBnQhQfR/Z71D8uLr4HwybZvBaEo9a6D8ZXU1Lq2NZJ2rQjHPKP+um/rbJ0tAccw/KwY66gC4GYwsBXp3nnc9ZRxSsBWRwmlknRx7Jgmjsw6EqSdayV0u1TY0qosVB5gPAZZ1uSO0OI4al0mipR6z2ROoUi1XVMUgv4902jx4; 4:W+gafyIYFUw4kCdm14M7r1JCPuN0eG+dut6L8EiZpf2jpLSjv2+WRmTAduy+4WPWgJu8YgZR0+mwrN1WfI5I900iKphMK9mXX+qCNp6t4c/7u4qHudterwW2bs4a6E8ulbF2mpGJB9Zh1R8zmUBHq0PMietOQlhjFN0rKyF80yd/Sh829LwY2xTsmLMtFvchLxam549OKLa/zKi/Uij2NZ+ufEhdl2CROtjZIcX6w2v3NxvpuHtfPQhDR2k/3pKdhwLMKlbmrGuJcvv7A127i6lFTfOstQGvr7jjM5hu40aYn5ZuUvQOsS15eMbXVVTCoz5+iEIaZget5ayZ24oYot9zXlqTLWqFhovYBZHs3VY= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(37575265505322)(158342451672863); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93001095)(3231023)(944501075)(6041268)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123564045)(6072148)(201708071742011); SRVR:AM3PR07MB307; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:AM3PR07MB307; X-Forefront-PRVS: 0544D934E1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6049001)(39860400002)(396003)(346002)(376002)(366004)(39380400002)(377424004)(189003)(199004)(24454002)(31696002)(53936002)(7736002)(305945005)(31686004)(58126008)(68736007)(65956001)(65806001)(83506002)(16576012)(316002)(47776003)(16526018)(86362001)(25786009)(66066001)(49976009)(97736004)(6116002)(64126003)(6246003)(50466002)(8936002)(386003)(36756003)(3846002)(39060400002)(8676002)(81166006)(81156014)(23676004)(76176011)(65826007)(2950100002)(6666003)(53546011)(478600001)(5660300001)(52116002)(106356001)(229853002)(230700001)(2906002)(2486003)(52146003)(6486002)(105586002)(78286006); DIR:OUT; SFP:1101; SCL:1; SRVR:AM3PR07MB307; H:[100.94.228.101]; 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: =?utf-8?B?MTtBTTNQUjA3TUIzMDc7MjM6T1c0MFNPcXlyeFRZS05uT213cUczcUthcmNK?= =?utf-8?B?clVHTlNQNTZzMUxZWUtiOUJTd00zellDVC9Nd0l5eWpZQ2hNa1J1SW9nbG1V?= =?utf-8?B?akVha3JtYVZHRVJ3RTBZL2dxNUoyQ2hTOFpWU0ptQzl5NmIyNzBxUVZFRHc2?= =?utf-8?B?blI1bktsV21CR1RYL1FraUN4OXJEdUJPSkRwSHV4cEFhVzNRbjZjaHZycFJr?= =?utf-8?B?TWE1Rk9WOEpWMWZrWWdmRGdFM25aN3VHbXhYd3lGVWlCTTEyd0dxYnpvK3Q3?= =?utf-8?B?OXpiZDliMDgyUlZueUgyQXRGT0pwcWNwaStubFVaR3VUSFdhMXJ2SVZHcnUr?= =?utf-8?B?SlF4OVo2d3N5aXd6SnVGQjhZSDczemVjZ21wcEVQbEVqSGdBRXZSVVlKaC9y?= =?utf-8?B?UmEreUtsVlB3Mkx6b2c4SGhpbnBLWkZTanhyb3phS1ZDV1h6dW9MWEpEOGk2?= =?utf-8?B?dDRmV1R1L0ZLbzB3WlhRWjA2bjZwL2FtRjdFZzJpQkpvdTQvUUhNdFY4LzBo?= =?utf-8?B?V1d0S3J5ZkRmb2c0cGU2c2FiOEFyT1VWdk9ZZ29QT0IrY0dwQVYrT1FqNXdO?= =?utf-8?B?VXlVdnRqK2lKZmQvZSt0bDMrVklxcWsvN2t5T3d4N3V2N0tYSS85Y2tQLytL?= =?utf-8?B?em1LZWg1VDlpZWg3RzJUbHRSMGNHS0VuY1d1M0RhN3ArbkJsRXAwTFhPS1ps?= =?utf-8?B?QnY1aE80Nnp2aE5xd051eDR6TXRhTDhsb3RIYWxrSHQ5bzY4Wll5Ung4SWh2?= =?utf-8?B?SlFzaUF5c3o2c3FDcUIrMzlRSDgxSHVtL3g2Z3J3WDY4RXBQdUZXNlFuSzNP?= =?utf-8?B?QUw2U040SkVBU0NtQmFSOVp0ZXpMaUF4ZDhNUDdhSkM3UnpaZnJGWGxGRFFD?= =?utf-8?B?Q0ROOHU1SkF6bHJJM1loTE16ZDZUNG9TdVRoUHpCRFRPTExnTE1Da3VqRkd1?= =?utf-8?B?bzlxd3pNSk8rVnRhSU1ZK25ySHRCMW5rVzRreUVKYWtxMUZXOUFlZHRyOWhI?= =?utf-8?B?RHZNSDM0N2JoTnBabEhxTTdhcUhZcVZpcGhmb2VXK1BQZndhUXRkRGVUNS9y?= =?utf-8?B?L0dLd1Q5TFI0VEFhVnA3UXAraWJJSFk0RWk3MlcyWmt0bnA3K3BNWXFZcEFl?= =?utf-8?B?ZEs0dFVLQnljbkkyQzZERWsrWTI3a0tGMUxWRU05QnZyWi9VMnJTbmwrUzBZ?= =?utf-8?B?aFV4M2xmOHB1Y0cyQWJsSzdaUHMrNWNnRnZkdmF1RkRGL2QxVDJmMU9YcE5H?= =?utf-8?B?c1ZkWFZublRVMEcybmhGWFVZRzZ3ZUdPQ3pRL01uODVVNG9CN2xlU082cFdl?= =?utf-8?B?eFhQR3VxNnZ2Mm5BenZ6OHpzYVpDM084Q0QyNC9uVTdvT0hOSlNBSG1jR2l0?= =?utf-8?B?aGpxaGVrdEFWTnB5dWRrSm9RdlB2M1JTSHBsdk43NHhWWTlxVC8xTHpydTJo?= =?utf-8?B?cFBONDlmeXNQZ3YxemJDNWx2NWNJZUsyTHpPeDFIeFlQM3lhQXdiRWJRV1RX?= =?utf-8?B?R1VuaTRURktZaFNWZldmZHRqWG9iY1hPNThqVExrWFNDZXN1Wnh3RkRPMUdY?= =?utf-8?B?Ym5ucTdZaldEMDdJU3pmQk9uY1NkZ0htLzV2cCtQY0ZxWHJzMFF6bWtRaGRz?= =?utf-8?B?STA2ZmtpanVwMFZ1RnRrKy9yWGI2cklsUWlMVVArTG5tWGw3K2liejZFNUtt?= =?utf-8?B?SVF3QlJPMjRKUVlpZUNnUEt2UC9OYVF2c1FpdjhiMG5kdHlFZHNhc2tsRjkw?= =?utf-8?B?bHRTd0thYmh0QStNWlMrV3V0WVEwWjl6REtrNSsvTEkzOG5iZzdkR3RDTURq?= =?utf-8?B?YjVPN0hqbEtKb1F6YW82ZEFONXJDSnJUQUYvZkFmcHVnNTZUVFV1cXEvbVov?= =?utf-8?Q?wdNB/PIX38=3D?= X-Microsoft-Exchange-Diagnostics: 1; AM3PR07MB307; 6:mjkNKDCmC6lr75PSaVOdnKRXMXqSJLty66sVtQbjZZvCfrC1st9QiOYmJM+xoPGq2rxGYQ26e1stuFIScepcMy7tJBSbsGRk9xUnTWtkDbPzgDtmwbeIWnCWsNhn+Tmtf8jfr6RQ3H50KD1kG7ZrsERK6GckNeP3VeGf22i336A5yQiRlJ5wJAv6OOazc3uoeEUS4/tpSvXnNBZ+otDwCrmh/ru666JI/7riDBnY+8F+O2oBc+l6njCzn2R3cbCFk9esDLF/7wzMyhD1xPheMsSClG8y6mBytvDyHQOIkpekShJHnSZKPhM/M4XyfNC7wWItK1dafXVYg2qFdfikQH87B065y3WHZeUlc/DuX+4=; 5:8lhiFSwnDlQfDxsSFlfHRZrt2hoEh6D0PFo1jue3dN4ij+wIA0pTA3qv4E142s92A0aY/4rWFKdi/n0y399OtWApFMwIwaR/DGnC5XaiH10mgcbIIy3S9S3t4QLcXOeejpGuiYnwmpaUnkfYME68I/N+PKmVsaCJknEFjNfaSWA=; 24:w2pdiSmw8ZlFeDFKLsWPxV/UDEcRXwqSXJm0TfDk/jcV/NtimvPwX2m3qE2EoGaG41SjZGr5na93NqHHZly0zxwhAj+WijSpjEG8jx2Kccw=; 7:UAl+HieY9OidqmGuNp1QyvfASWWpen5E1d/jCU+428FKXDM5xhOUxksSd0EpnKjcNrbN02LtuM0zpG08olhfg+58CxynMTAGyhMabI3E/VBAhTxOuwYeQeEAt3LBwkTZtIbtl3VIwoKjfsp0IloyO6e9F11eRzXDaSrECDwAlgu03e6awPImcjxhgtaNsoKS901qbEowA7ytux7Q/Q8W8/QQd/tf6aWyJG5zOnorniJ7qdoT6fXdBbOx3XG+R4Qw SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2018 17:21:09.5543 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2783c2a6-908f-4c6e-c04a-08d55529e13c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM3PR07MB307 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes On 2018-01-05 05:34 AM, Yao Qi wrote: > When we set bfd/development.sh:$development to false, GDBserver failed to > build, > > selftest.o: In function `selftests::run_tests(char const*)': > binutils-gdb/gdb/gdbserver/../common/selftest.c:97:undefined reference to `selftests::reset()' > collect2: error: ld returned 1 exit status > > selftest.o shouldn't be compiled and linked when $development is false. > With this patch, in release mode, GDBserver doesn't nothing with option > --selftest, > > $ ./gdbserver --selftest=foo > $ ./gdbserver --selftest > $ Hi Yao, Same comment as the for the GDB patch, and here's a fixup patch that does what I suggest. Simon From 1f610a553d226e00ef3832c518c45e36da6d0702 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Sat, 6 Jan 2018 12:17:18 -0500 Subject: [PATCH] Same for gdbserver --- gdb/gdbserver/server.c | 2 ++ gdb/testsuite/gdb.server/unittest.exp | 13 ++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c index 881ee48..3a4661d 100644 --- a/gdb/gdbserver/server.c +++ b/gdb/gdbserver/server.c @@ -3768,6 +3768,8 @@ captured_main (int argc, char *argv[]) { #if GDB_SELF_TEST selftests::run_tests (selftest_filter); +#else + printf (_("Selftests are not available in a non-development build.\n")); #endif throw_quit ("Quit"); } diff --git a/gdb/testsuite/gdb.server/unittest.exp b/gdb/testsuite/gdb.server/unittest.exp index 646babc..e947ff2 100644 --- a/gdb/testsuite/gdb.server/unittest.exp +++ b/gdb/testsuite/gdb.server/unittest.exp @@ -30,12 +30,19 @@ set gdbserver_command "$gdbserver --selftest" set server_spawn_id [remote_spawn target $gdbserver_command] +set test "unit tests" gdb_expect { -i $server_spawn_id - -re "Ran $decimal unit tests, 0 failed" { - pass "unit tests" + -re "Ran ($decimal) unit tests, 0 failed" { + set num_ran $expect_out(1,string) + gdb_assert "$num_ran > 0" $test } + + -re "Selftests are not available in a non-development build.\r\n$" { + unsupported $test + } + default { - fail "unit tests" + fail $test } }