From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by sourceware.org (Postfix) with ESMTPS id D26953857828 for ; Mon, 22 Jan 2024 17:19:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D26953857828 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=oracle.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D26953857828 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1705943958; cv=pass; b=DAj7lokQGbx97P4Q6yBX4UmbhfjA1CB1A/P4Eznp9/mTjQfGYWFgWqIGXbVOzDdnyp9Xoc7Jmov4l7VLfKbj0tgv/tuzu+2ZZxOxBEIucYyr68fscAObkIwSpACW+y3twjd9wyBk21Ykek8xoGzuUGUvX7C8Md10MVta/yREs6w= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1705943958; c=relaxed/simple; bh=EYnfvrDlHqV94WWa7xJUAolscnQ8kPhLdZIh3zGDaG4=; h=DKIM-Signature:DKIM-Signature:Message-ID:Date:Subject:To:From: MIME-Version; b=bqQgqFoh25H+Li5vQnR+w3WFovWRiOtM1DUhREcQUfQgLJmo3gQ4eXF320PfvTu636jIkhMEnTd2mfOeBk1TdlkK01cLayiSmy6uPXhgEWpKqhQmW4J0MGaLz4lgEv+xlfHWG2o1HDiSunfC8MN2FK6JDoA+ibIpL8ADR2EhaIg= ARC-Authentication-Results: i=2; server2.sourceware.org Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 40MGJoLk008665 for ; Mon, 22 Jan 2024 17:19:15 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=content-type : message-id : date : subject : references : to : from : in-reply-to : mime-version; s=corp-2023-11-20; bh=TJ/dC7Z3uQa14dUWenl0X1GjkPUhN988TikuQSaWjcE=; b=NtIYpzzZg979wh///fZYqBta7m7/EOEFIdTJnJNXW1JTHfV7qZk+qp4bvlLMfqwina5Y WA0yUmRtTXfAaNa8AXTsCciXiaeufiJIKAgFJSK9TunD4kzBNgfrWMpQQDhm+cK3HGEY SrmIOJmp6tQm59m0u9rBWxvtgrXoKQf9Mxv+fBIIOXZ64wuhTbuickLd0p+T8qh40rWk kdgUOdDPYO9IwvaTxVCwe3pIlJQy19FXQseQcwbGCk8O+hNTqyVCEAEXeN7niU4xm892 Rba+xvxMqt+vm9PwJvtBp91jkwZd2rm2zLXnFyXZCwugDVK896NAR+Kch8aJAK48LCvG bw== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3vr7anm5fh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 22 Jan 2024 17:19:14 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 40MGVWCt025296 for ; Mon, 22 Jan 2024 17:19:13 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2169.outbound.protection.outlook.com [104.47.57.169]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3vs33rj2g6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 22 Jan 2024 17:19:13 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eKCMSMWgSaBLxjX+l6c5pjLb0sxrlSj4ybwtLobCcIyffBz1+Ewl5cvbgA0Ce1L5dRoPBsgIC2KgnmrBmk5UuK6OlJLggncAIYEZ23NxyiWuvTVUZ2ZyEXquq8R3r01JL+cPoewL0gPj9clW7rK9fh/uCqdDXOXyu9CxT2JRVRhCnWltxOFJNAl5uJwAh4IXaIX6E4pdqRhJDc+lfmxx3MWEnt2W1K/hOaMgDg0eMB6z1aDLq12KBKXBznDxadJQqVKnVnX6j1eDuxlctntC5dVOUiHZsqCikgsr9rdClrxu/jgi40ki+RyC0HQJp4+5Syjy9RpoSkCv4MmES8Tkhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TJ/dC7Z3uQa14dUWenl0X1GjkPUhN988TikuQSaWjcE=; b=lMQuXhb+Y4/CBss8qv1Tf1ZYUnntGhKMT9OeVuMm0pRe2RX/vINHlWP0X369KSnBuxBrbf+1QDilHwjhFkq7D5cO0zRGwVskH/uMwx73qa9jGUpFCL6mVnlxZLvt0ZJbKvNvtDm0HWtDYbtR5QGMoSaQD4OQ6Zil1jglDaV7sVPgEe16bMtstcfwB+iIcZc5E1H55gat0yvH4Bwlmve1NTUWZ0cNIDDsA77lVdAFcbfI6zaeUjZjRC3NHNBpcpL07ILP6Vnl817YeFjRb1EuaZZ84zS8v1rjqOPMB2Y7aQc9kAY+5toxmHpdqiqpbCKz+FBvMgqY2PAFRtsevJGkdw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TJ/dC7Z3uQa14dUWenl0X1GjkPUhN988TikuQSaWjcE=; b=bCeS+dx6g6x+5oxI35Bzx1UI7NVoYdzzVeIx4N9MTRwLO/KkW9UGWFAbtNy5KvvRInsNQ/M9aqiO9vQv6lrzFaWz6xdHb9lb0b/GTTo9XHh2swYMihXUaiQBBfLS54+lshoQaInsM5PnLK6M1TPlXmgxtGce4FiIAyHpY3bU9DA= Received: from SA2PR10MB4636.namprd10.prod.outlook.com (2603:10b6:806:11e::10) by PH7PR10MB7011.namprd10.prod.outlook.com (2603:10b6:510:273::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.34; Mon, 22 Jan 2024 17:19:11 +0000 Received: from SA2PR10MB4636.namprd10.prod.outlook.com ([fe80::c249:6cf5:215e:6e2c]) by SA2PR10MB4636.namprd10.prod.outlook.com ([fe80::c249:6cf5:215e:6e2c%6]) with mapi id 15.20.7202.033; Mon, 22 Jan 2024 17:19:11 +0000 Content-Type: multipart/alternative; boundary="------------vP3yqzQMGV60ZVCVGtm4Mog7" Message-ID: Date: Mon, 22 Jan 2024 09:19:07 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.0 Subject: Fwd: [PATCH] Fix 31252 gprofng causes testsuite parallel jobs fail References: <20240120024227.1566464-1-vladimir.mezentsev@oracle.com> Content-Language: en-US To: "binutils@sourceware.org" From: Vladimir Mezentsev In-Reply-To: <20240120024227.1566464-1-vladimir.mezentsev@oracle.com> X-Forwarded-Message-Id: <20240120024227.1566464-1-vladimir.mezentsev@oracle.com> X-ClientProxiedBy: BL1PR13CA0232.namprd13.prod.outlook.com (2603:10b6:208:2bf::27) To SA2PR10MB4636.namprd10.prod.outlook.com (2603:10b6:806:11e::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PR10MB4636:EE_|PH7PR10MB7011:EE_ X-MS-Office365-Filtering-Correlation-Id: 72695721-7f6e-4afb-c9f5-08dc1b6e3fed X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YNuxo7T6EM/ITlqe2r767PE4Y7FYv2Gl7zEWSze9QfHS6vIL1mPHGfhra0d2SY68wB6VkOzGzEWI0jW0lxeTV5iUZDuqJURt3nvUFgQ/H3SUgkqBHi0caxgH6XuqeNSh693aSaQvsB/J0YorznfwPV0JWELQBiy+vlkGLijCtaL0H3wNQuNL6XpHXuLIKsXreutgQe9quKwI0hcZwylLhLeWXAK3HMNF8MBvTo1d8yRAJWk69Ty+t9cHbfSfx9uzpdwFkQMYR2TMIUNbd5ZBrNkPjqoNG6vbMY/BWiGqJs9yVQqsGlk8ch32BReokeQfO54nJevuCg7LC+lrSxlikNEmb+5U4EM9xiym7VqdmfnPzUqkBAe0fTs7MA0A/FkdFkSRtonQu8kg9Pqf7oxZ9OkWnzG06sIPGD1zvPTCm6tGH03vnmlDhP2dDUZ0WMl54rvVa0OM4QFmE+d5XW5mR7F0d1qo/E506YK+IkvLiT1EnrFQFIzjPFLwcqDKJlyqDqCXsJ6dh573ismPRe3hc036qnTllKLCLfl/e5h7M/DAWoqS5GXbs44clKGMhadizmBC/lKRu1y3ykm7jrC6NHb1Huk4suyiMWtfn0W3GkKgkDQsW5w7WGxdPX65/miaN0i2dUiPnC6YFihLM+sAaA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SA2PR10MB4636.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(136003)(396003)(346002)(366004)(230922051799003)(451199024)(1800799012)(64100799003)(186009)(6506007)(2616005)(6666004)(6512007)(33964004)(83380400001)(5660300002)(30864003)(2906002)(44832011)(41300700001)(66556008)(478600001)(66946007)(8936002)(66476007)(8676002)(6916009)(316002)(6486002)(36756003)(31696002)(86362001)(38100700002)(31686004)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Ni9yN3B6b3RRMG4rZHhacS9HVzMrOU54MEk1M09lSXBMbVE1aXlUdWdzOUZV?= =?utf-8?B?aG1vaGFTelpTb2tJZ2hRc0xhSE01NFBPelI5bW1yZHk4cjMvSloxSHFiMldD?= =?utf-8?B?Z1BmVHNacUk3bGUyY0psVjNZYkM5SWprbXlJNFpFcVJTcUxFenZOWHM4eTNW?= =?utf-8?B?TmxMaEdwUnhQcHFJMnRnUGMvSVBhQzFBS3BTbTFvb0RUNmxzaW53UDJEaklT?= =?utf-8?B?dStGbDZxNkJIUE9TUzA0VXpoUVV1ZFRjeHduWG0xTVRZNitWcnVCL2d6eVNY?= =?utf-8?B?bVo2MFVjUnRPd0pMQi95U1NKL2dqWWU0NGczMzNxM1pkL2xrL2NMb0tPbmpj?= =?utf-8?B?cDNud0daWHYyVitJMm96UldDcVRFYXhUUWpLOE5lQ1lKNEt0Umtmd3NzMk9k?= =?utf-8?B?eU40VWtBSUxmTEViM1Z0Qkdsc2NlWllLLzQ4K0U0Z3YxWVp1UFF3WWhsQUhD?= =?utf-8?B?UEhMS3hKMEJ5RGdXanlrcU9oSU5PS1hyTVhyTkFTMk9TR3FtWkFBTTVFN1di?= =?utf-8?B?TmRkYU93VXZaUWdvMmQvUmdVOW5sM243dWJGSFZvZGRiaUJJNGsyZStaY0tO?= =?utf-8?B?Mkk3WDFtYUJyV2hXNHcwRUUyQ3lNSWw1cFZzRjBoU1J5NVZDVEVKSGhQMUQ0?= =?utf-8?B?cXlTYnlMaStJTUtaQnZIUGh3R201R2x0bVRNRXFQWU4zQnZoeXAyYWFmUE9j?= =?utf-8?B?RUpubFEyeDFUNWZ4R1Bmc0I1T1hDVTd1OXJFMG9lWDJmdzczSTJLeEhhL2Nr?= =?utf-8?B?ckRjQ2IwdTU5WXpYcXo3cE9iQ2djbld6UkJaZzVkZXZWMjR5TUpLdFZtQ01u?= =?utf-8?B?WWRhUVJWekNwWFA4NU5hazd4TWFBai9iNkFOZ29JVnBFa1dQSUR1TTdhbGFC?= =?utf-8?B?UnU4OUJyenFpdVdlZXprOHp0ekxrd1JMckR0SGhHalBYMjJsVm5TVUJ5K1U4?= =?utf-8?B?aEJWMWR1M3FyeGh5SDhQdmZGaDMxeXRrVVFHMzZhWk9Wb0R2WHJVbWRkcXQ3?= =?utf-8?B?ZWQ1b1V0OEFHU1dFcmo1eDFhZ1RJK015emhsUExqazZJd3dpa3hGYm1BRDVu?= =?utf-8?B?dC8xZ3BhZDNHaDB2M3c2SlkxbkU5YitrQ1hPbXkwcGZCVm5OR3BrTFVZcklP?= =?utf-8?B?ckFkK3hPQkg5TElOcmhGSDBrMk5EWmhIZHZaVzlZbnZsYkhrK1ozMXlaNXQv?= =?utf-8?B?eitOV0s3Y3QwSThiODFOVjJLakFpaE5jQjJIL08wNk8xRFhxZGhCbjBLUzVY?= =?utf-8?B?VmYwbkVsdlFNSGxpdWM3aEFaMkZGNmxLYkhZK3p0WUpoUVVvZjZnZ1UreHFX?= =?utf-8?B?RXVIbVNJZnh3cE10Nk50QWNqd25FbE51YTROd053dnlGOHplVnVmRDd6eGx3?= =?utf-8?B?ZnIxS1Y2TjFIWEEzMnJjenBHZVJsT0FVMWZlK1g0YWE1THQxbHZ6RmFuQm5t?= =?utf-8?B?R0JkTnE2c3M5WG9WbFd3NXYzSGl5eHlFTkxSeTh1TC9raWlqWTZLTWxTZkJZ?= =?utf-8?B?QXpvbnNKUXV5clFqM2hma01wckp1dXgvYTBRY0lId3NmQVNHWmV6TmJrZGt2?= =?utf-8?B?WU9pK0RvQmdGTnNtV0x0bzNVRENlSGdrcWh1UWpjM3hFb1oxU1Y5ejVYVW56?= =?utf-8?B?WTEydDNQYjB6Rk51TzUvblRsR3hBd3cvekR3VDNzL2Z1Z1dJTzM1SVYxdC81?= =?utf-8?B?dzNyZWdLa1N0VTh6ZVcxQkJKQXdZVnhjZUdEVHhCcmo5bHBHdUx4TS9nMjho?= =?utf-8?B?R2cwbjUvL3R6TlcyZG5KS3BzMG9ER25hdE9CWmROZitBYTEyMVU1UHRpWkJx?= =?utf-8?B?c0FhUWtMbTFsbktUN0VvSmh5MHBDM3pVSDdjczNKSWsrR0pIY1ZCbnNyTGYx?= =?utf-8?B?VVRZSnI0ZjJiNzdEblB0ZEhKelR2ZlJEdCt3bGpCNnUyN1dVQ0FMUXgrZ2ZT?= =?utf-8?B?ZmhGRVd0L3lORC9yRTZPVHlacjlVOWo4ZDBnY0hPWVIrNkRhNDlvSHo0ejN0?= =?utf-8?B?eVE0NVVDbjdjOW8xSGFHRHdzRlJpZkFXVkhuNkhWRzRwSnkzM2UyanZ6NkNi?= =?utf-8?B?TEUrNHkvenFjSWs3NTJjdkNsMDhOcHZkSkQzbFhkM1puY3ZwZmVzMnVrNVdQ?= =?utf-8?B?YXJIUVpGZDJGV2R1cW1JQUVIOWtUWnV3MW5vV3lpWGdsYUJjN2p5eFhsNXlN?= =?utf-8?Q?87qbYEIepYQNQg9gWvNT+Gs=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: bik2dHlk1Jo40qgD6TdyD0MD23+/binOTeXrIk6mSxP8BwayFPdPFHSnwhvNmunlOn7Liys63CkzaihFAtdr8YfoYqGlA071EgKQhwaRjQuoC0SfBArn1dO/VPs+pO9TUqTJqFdO0M/kvet4iGEwe/haCFqHQUZ80D8HrHyg/y+PeDnmtjgw6BFT21yDJ1SjKAzDf7lo/jpFQemCalq1w9+LWVM3ADePJAEQ/TXM+gtjwTasfHMFd1NP8ej263O1TQmfW5m0yuOUPyvj7dIcAfre6etxyseSc/8NgblhCChf2cDgDnUAEhYMwVkg00Xti/FKEavswUI37AnftNqpeui/j9LKb4ksqrtEzoD+2Njfe6tVIemBzHt3EtWa4DpIU/AEe816XktxehGSz29bL8Ybge67bn37xTA3SyWXY8FmUnHYDLmwiW1xF7BHid9o+RIyJqvwZbIb8TtotxE1zWtHZjxZQlg9F7e9gIt/52E4rizsRGQV/KeMY6tex1oClOQ0tuBh8jTQuFXXVfyV19T2JsMv1Yf8pIJo2LiqaljetX6gJGeRUxT5RGRZfO6XoQ6UxqZeAY7dkmaZppcX4yBZ63BDLCq7MWnGreEKYJU= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 72695721-7f6e-4afb-c9f5-08dc1b6e3fed X-MS-Exchange-CrossTenant-AuthSource: SA2PR10MB4636.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jan 2024 17:19:11.3660 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: UdkBORSg0dYeBvp6u5RCkfM5Xumu6a8vDBsmlkxEnIzvfbb3QnGkE+jDx9wR6FWm4sf1fH/5/YzbsVzicQnOlFVPPE4o9HPyd4m3V4GXqyY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB7011 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-22_07,2024-01-22_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 spamscore=0 malwarescore=0 mlxlogscore=999 suspectscore=0 bulkscore=0 adultscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2401220120 X-Proofpoint-GUID: VNHBZ-BkxZBy16AFpZz3-CkLHL5MSo-d X-Proofpoint-ORIG-GUID: VNHBZ-BkxZBy16AFpZz3-CkLHL5MSo-d X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,HTML_MESSAGE,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --------------vP3yqzQMGV60ZVCVGtm4Mog7 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit   OK for 2.42 branch ? -------- Forwarded Message -------- Subject: [PATCH] Fix 31252 gprofng causes testsuite parallel jobs fail Date: Fri, 19 Jan 2024 18:42:27 -0800 From: vladimir.mezentsev@oracle.com To: binutils@sourceware.org CC: Vladimir Mezentsev From: Vladimir Mezentsev Before running our tests, we made a fake installation into ./tmpdir. This installation changes libopcodes.la in the build area. Gas testing may fail if gas and gprofng tests are run in parallel. I create a script to run gprofng. Inside this script, LD_LIBRARY_PATH, GPROFNG_SYSCONFDIR are set. putenv_libcollector_ld_misc() first uses $GPROFNG_PRELOAD_LIBDIRS to create directories for SP_COLLECTOR_LIBRARY_PATH ($SP_COLLECTOR_LIBRARY_PATH is used to set up LD_PRELOAD). gprofng/ChangeLog 2024-01-19 Vladimir Mezentsev PR gprofng/31252 PR gprofng/30808 * src/envsets.cc (putenv_libcollector_ld_misc): Use $GPROFNG_PRELOAD_LIBDIRS first to build SP_COLLECTOR_LIBRARY_PATH. * testsuite/config/default.exp: Create a script to run gprofng. * testsuite/lib/display-lib.exp: Fix typo. --- gprofng/src/envsets.cc | 36 +++++++++++++++++++++----- gprofng/testsuite/config/default.exp | 37 +++++++++++++++++++-------- gprofng/testsuite/lib/display-lib.exp | 4 +-- 3 files changed, 57 insertions(+), 20 deletions(-) diff --git a/gprofng/src/envsets.cc b/gprofng/src/envsets.cc index 1ca39ed9ac1..9cef7452df7 100644 --- a/gprofng/src/envsets.cc +++ b/gprofng/src/envsets.cc @@ -146,20 +146,42 @@ collect::putenv_libcollector_ld_misc () // so that -agentlib:gp-collector works // and so that collect -F works with 32/64-bit mix of processes - // Set GPROFNG_PRELOAD_LIBDIRS + StringBuilder sb; + sb.append ("SP_COLLECTOR_LIBRARY_PATH="); + int len = sb.length (); + int cnt = 0; + char *fname; char *ev = getenv (GPROFNG_PRELOAD_LIBDIRS); char *libpath_list = NULL; - if (ev == NULL && settings->preload_libdirs == NULL) + if (ev) + { /* GPROFNG_PRELOAD_LIBDIRS is used only in the gprofng testing. + * Use these directories first. */ + ev = strdup (ev); + for (char *s = ev; s;) + { + char *s1 = strchr (s, ':'); + if (s1) + *(s1++) = 0; + fname = dbe_sprintf ("%s/%s", s, LIBGP_COLLECTOR); + if (access (fname, R_OK | F_OK) == 0) + { + if (++cnt != 1) + sb.append (':'); + sb.append (s); + } + free (fname); + s = s1; + } + free (ev); + ev = NULL; + } + if (settings->preload_libdirs == NULL) { settings->read_rc (false); ev = settings->preload_libdirs; } ev = dbe_strdup (ev); - StringBuilder sb; - sb.appendf ("%s=", "SP_COLLECTOR_LIBRARY_PATH"); - int len = sb.length (); - int cnt = 0; - char *fname = dbe_sprintf ("%s/%s/%s", LIBDIR, PACKAGE, LIBGP_COLLECTOR); + fname = dbe_sprintf ("%s/%s/%s", LIBDIR, PACKAGE, LIBGP_COLLECTOR); if (access (fname, R_OK | F_OK) == 0) { ++cnt; diff --git a/gprofng/testsuite/config/default.exp b/gprofng/testsuite/config/default.exp index e22d99bc422..6b51d578d9f 100644 --- a/gprofng/testsuite/config/default.exp +++ b/gprofng/testsuite/config/default.exp @@ -19,6 +19,7 @@ # MA 02110-1301, USA. # + # The "make check" target in the Makefile passes in # "CC=$(CC_FOR_TARGET)". But, if the user invokes runtest directly, # these flags may not be set. @@ -36,18 +37,32 @@ remote_exec host "sh -c \"rm -rf tmpdir; mkdir -p tmpdir\"" if { "$CHECK_TARGET" == "check-install" } { set ::env(GPROFNG) "$PREFIX/bin/gprofng" } else { - # Make a temporary install dir to run gprofng from, and point at it - remote_exec host "sh -c \"$MAKE -C .. install-gprofng MAKEFLAGS=program_transform_name= DESTDIR=$BUILDDIR/tmpdir/root\"" - set ::env(GPROFNG) [exec find $BUILDDIR/tmpdir -type f -name gprofng -perm -u+x | head -1] - - set x [exec find $BUILDDIR/tmpdir -type d -name gprofng | head -1] - set ::env(LD_LIBRARY_PATH) "$x:$x/.." - - set x [exec find $BUILDDIR/tmpdir -type f -name gprofng.rc | head -1] - set ::env(GPROFNG_SYSCONFDIR) [exec dirname $x] + set ld_library_path "${BUILDDIR}/src/.libs:${BUILDDIR}/libcollector/.libs" + set orig_ld_library_path "" + catch { set orig_ld_library_path $::env(LD_LIBRARY_PATH) } + if [file exists "${BUILDDIR}/../bfd/.libs/libbfd.a"] { + append ld_library_path ":${BUILDDIR}/../bfd/.libs" + } + if [file exists "${BUILDDIR}/../opcodes/.libs/libopcodes.a"] { + append ld_library_path ":${BUILDDIR}/../opcodes/.libs" + } + if [file exists "${BUILDDIR}/../libsframe/.libs/libsframe.a"] { + append ld_library_path ":${BUILDDIR}/../libsframe/.libs" + } + if [file exists "${BUILDDIR}/../libiberty/libiberty.a"] { + append ld_library_path ":${BUILDDIR}/../libiberty" + } - puts "### LD_LIBRARY_PATH: $env(LD_LIBRARY_PATH)" - puts "### GPROFNG_SYSCONFDIR: $env(GPROFNG_SYSCONFDIR)" + set f [open "gprofng_wraper" w+] + puts $f "#!/usr/bin/bash" + puts $f "LD_LIBRARY_PATH=$ld_library_path:$orig_ld_library_path" + puts $f "GPROFNG_SYSCONFDIR=$env(srcroot)/src" + puts $f "GPROFNG_PRELOAD_LIBDIRS=$BUILDDIR/libcollector/.libs" + puts $f "export LD_LIBRARY_PATH GPROFNG_SYSCONFDIR GPROFNG_PRELOAD_LIBDIRS" + puts $f "${BUILDDIR}/src/gprofng \"\$@\"" + close $f + file attributes gprofng_wraper -permissions +rx + set ::env(GPROFNG) "$BUILDDIR/gprofng_wraper" } puts "### GPROFNG: $env(GPROFNG)" diff --git a/gprofng/testsuite/lib/display-lib.exp b/gprofng/testsuite/lib/display-lib.exp index 4843c3678bf..32e8ce5dd73 100644 --- a/gprofng/testsuite/lib/display-lib.exp +++ b/gprofng/testsuite/lib/display-lib.exp @@ -26,8 +26,8 @@ proc run_native_host_cmd { command } { verbose -log "$command" set run_output "" try { - send_log "% timeout $TEST_TIMEOUT sh -c '$command' 2>&1\n" - set run_output [exec "timeout" $TEST_TIMEOUT "sh" "-c" "$command" "2>&1"] + send_log "% timeout $TEST_TIMEOUT sh -c '$command' 2>@1\n" + set run_output [exec "timeout" $TEST_TIMEOUT "sh" "-c" "$command" "2>@1"] set status 0 } trap CHILDSTATUS {results options} { set status [lindex [dict get $options -errorcode] 2] -- 2.31.1 --------------vP3yqzQMGV60ZVCVGtm4Mog7--