From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id 22545385841B for ; Sat, 20 Jan 2024 02:42:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 22545385841B 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 22545385841B Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1705718559; cv=pass; b=POqdc08MT4JMP5iV4lkKtGhAewC0JrfsKo48GURfEPfMLNuSB+bPD2gie8O/hLzEtHOdntqX69oP96qAQcys90Shg0QNhBZxHn3bcJt4+gY8eshLcwK2P1FntArJ7oO5Mq4rNZ2v8/2rHmJgJEGXQhVkk8kVJlT+7vvhKArINMM= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1705718559; c=relaxed/simple; bh=qY+jcSUZJXChbVIkUJD/m6q7AOBSVNJPpJaARNPstKo=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-Id: MIME-Version; b=xseSeVWTOuq0coODDrOfLZw9gqYV7boWeBr9vDn4D4dX+XnC5+u906gHY4MbRBhOKJP2E5NQzgQUEHc+y9ktmLs2Y/cLifMsRDqoPUjqosRCs72TfrRPsAjwuzksHYeR3jqt4pfCGMfh/95eRilvn6mNSWrBCmrtMrYdx1BBZWk= ARC-Authentication-Results: i=2; server2.sourceware.org Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 40K1wgcw017092 for ; Sat, 20 Jan 2024 02:42:36 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=YsS3o9CGNwSQvJFG1Sh0qb2kVQKkzw83pfbyqvz/yPI=; b=ocbp+JqFuwyeVNz1SeO0+Fu26jpdZYgvWZwRQK6r/83yny2+csk9IAd8xS2JoxAhXLpB 2qla8dHZ6RiY7dbAwNnUrw2h9ah/5/r/iylS7bS4BmR2qtv0LoCsRJPl6y1DPm/2pJcs t5KfduL+to22Ey443t7EehexIlroMZzRp2MxIRspsvcKBwHQ/gOzdZ9ICJcARVEUgX+X QSGXLwsQkT2s63sCErGWUb6qh62WeJMNjF1TXcxM6nzq3RhifO9xrBO+9BpqKVidU575 gFfy/lXfWb44hbZ/YMYea6V03n5k7tG6o48/jsWBuCCLL09M/dfUiLutjMyCS5nxKQSt IA== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3vr4y4814w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sat, 20 Jan 2024 02:42:36 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 40K1XnY5001145 for ; Sat, 20 Jan 2024 02:42:35 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2100.outbound.protection.outlook.com [104.47.58.100]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3vr4m9j8tp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sat, 20 Jan 2024 02:42:35 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N8B8E21rPhRflWHeiMt9uUy8AWP2TRd36OHv+MiZ/H1MRwlIp2v20OEHzsB8z79IIeizDM3Gpl/Se+VJRV1JPja5y5UbEe8hHTVUNLA0Q3zIyRL4lnSSt2AseBAb1dYhwQc/nLyTHikKmJjlUo0232MPK2z7KMe25GBgWOJG/du4RwtCSGvM2Zjb0n1HVmVb/Z75Pv8hNJs0DHwCOmB/YHAJ+uXyth1bhgLzaqTN3QFqyLsCUx1XhcAMklQC9OBdlASOUt48O3Ah+2ecKJDP1HAAkUpenOLDApkrV1F0FbzF90Gm3pgqXiCTliRzhIYh2lQfK0EA9nG9fdKovG35vw== 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=YsS3o9CGNwSQvJFG1Sh0qb2kVQKkzw83pfbyqvz/yPI=; b=fKuzrtTuKQ4ildRmMy6+X6kfNWpgdtMsl+uPiPY1alKRbvGXN+b5nH76ROwq6AmExXnFVu8WIQ0AsHWmPu3Wg5iHgBUcK5Z0kxEhefzNP/6777VaeUlrqbT/dtVyPyFyItEbUPiIxKdl3aOPgvj2dclGRFSQ//ZMuelmDJoqcsRAeB4NKwpGg/Eid6uqvcnmu1UUwOzgIYHHBBHZFcRxHAIRvPEB3xyNngMs+6LvL3Iq2TJ/K9UjVvWfHWUI1sIi1mEn3Tz2U/0EpFGcQ62bQ0g45jEjaIZfcvstq8rduDEDx9VSZqEz6/tWurPiogQ3ZARqo8wmz5wybtE/dwnW+w== 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=YsS3o9CGNwSQvJFG1Sh0qb2kVQKkzw83pfbyqvz/yPI=; b=XenHOf/UoUHkVJ+jNbtxV53frSX2OLgsH3XxyVEYv7kIMH+gueSHJw+H5WThsmroRuzR1M4ZtkXHfX9JQR7IIVp7JA+Z0dtFqTbHAo3kR6jXfpJCutactfGufeyHPv/sLWvmfMzi/Eq8/yrXF8O5bA82usceTEHu+Md1ndNoFWw= Received: from SA2PR10MB4636.namprd10.prod.outlook.com (2603:10b6:806:11e::10) by SJ0PR10MB5662.namprd10.prod.outlook.com (2603:10b6:a03:3dd::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.26; Sat, 20 Jan 2024 02:42:33 +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.024; Sat, 20 Jan 2024 02:42:33 +0000 From: vladimir.mezentsev@oracle.com To: binutils@sourceware.org Cc: Vladimir Mezentsev Subject: [PATCH] Fix 31252 gprofng causes testsuite parallel jobs fail Date: Fri, 19 Jan 2024 18:42:27 -0800 Message-Id: <20240120024227.1566464-1-vladimir.mezentsev@oracle.com> X-Mailer: git-send-email 2.31.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: MN2PR15CA0047.namprd15.prod.outlook.com (2603:10b6:208:237::16) To SA2PR10MB4636.namprd10.prod.outlook.com (2603:10b6:806:11e::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PR10MB4636:EE_|SJ0PR10MB5662:EE_ X-MS-Office365-Filtering-Correlation-Id: 31c2fb98-dea2-4bdd-a82a-08dc196173e7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bAbTK8h7RnTzbS8nzRSPMire9mP8jDZj07jyyhMgSm5jLahuv+Prh2FS1dQoO+wK/Glrs+YLlpB0YsjiXYC/SZ60B432H5xFsRIkpAR6+KKV4N6y2rl6Q//dinpRC/xZvIShxG0KgdbnVIO1JM5RXJ1qUbfLH9+BDXWg21YjLtFHMcaBagdP4aQFP1XneeCl/T5XvpjYR4ErmGLOypqpmCuAOlHY+Lfzn9g2vOtLndZPtx3/ogd/kZRSWylqHaYAl3KQUnO4ucspbJkrfbCHKENCV1ECBDTA81RGmk0e9zgyB4WQwYUFLU7iFz46wl4JtYFjsdOMl/M4cgWHpWjHUTAhJEF3fNTmPDMTKZqhrbtayuI/XXhu58KX1t7GCivpNZZsD+biIPyUgsu1maj+Ica95RXqWcz9IV5yRwSCIsJsBteK1/n7cgViOczKtb3J60aLhZLkYlLr8bSe0t5APdQEATakittTQ7SJB6v/31+4WBxhQcS4nLghmnQi5IBZQV3x/1K1AMiRQ7I0KY94w8pcxdcHyPlmk7G3eHVURRZVcYcszWiwi3PY8kf/ODxP 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)(366004)(396003)(346002)(136003)(376002)(230922051799003)(186009)(64100799003)(451199024)(1800799012)(6512007)(6666004)(9686003)(2616005)(107886003)(6506007)(1076003)(36756003)(86362001)(38100700002)(41300700001)(8676002)(8936002)(6486002)(83380400001)(2906002)(5660300002)(4326008)(316002)(478600001)(66556008)(66476007)(6916009)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?DGcV13Tn0ytJ29+ARAJ/9oYP319x+QvJMQjHpRjlZBxZiCug/06FPic8tB6V?= =?us-ascii?Q?Xw+5SdnqtLy/aDJ77IPmAFIujzI2bhOUUqG07DaSDTkrWLSj0aKNiH1wS3pk?= =?us-ascii?Q?acQ9/RzjNZjW9YJHmbfuYlaMynrUL6PJKWB1B8J2UwIEg64o1k7nQ6c1bsRP?= =?us-ascii?Q?dNhni2gJsnNjSoF4qoJML6KrSPp94VzcTUROQcn84rY/s3j/2eArU4rlixAI?= =?us-ascii?Q?dToQNGNggO/9ggt+fwwJvFDBry8/bPNC8ybZaIl9Wd5vwAdAmLJTJMl1kA9n?= =?us-ascii?Q?vOpYGmW2CEb3AOOF4FqX2uJUpC8z6w1h5u1lrcrliHkV89jR1+cBdXdAfY4E?= =?us-ascii?Q?G57tAeuZhSGAQhnBA5anZx2j5nZtYXBqQFfs3A9TvYHwgNB8SMYfzjYMUgOr?= =?us-ascii?Q?3SOXDGhDZ/LPZbyvzkM2u6KprBecFf0riZmT1QL+1xhPOWfKPi9PqQa1SsjH?= =?us-ascii?Q?sC23KKAc3I8CZ9ckjSpNPRjl9hKsyZ1NJrkapKSCb3r3xjOWH+mZ4XmT/XgO?= =?us-ascii?Q?VNY1Elxk9OXxndySumH6Q1v4DTHAS9fahhpuuixpGe4w99feMdvQDP/PyJhZ?= =?us-ascii?Q?Q83UeyaVw/JEEpQBd+KjQb7zklszykNiiiQkgIFX42jhJqHF/w8OldsrVuhG?= =?us-ascii?Q?L24Q9+IfvLgGoypD5v9IdMJBmYom4rA9J0mw0Ar+P+ygGiuwfmL8nPy/t+d3?= =?us-ascii?Q?6SKipZQMgv/lPuj2C7VOOiTyjW81F2hv676rQ04xovA64gnrZfVxyfQ+LEEF?= =?us-ascii?Q?QIloPtZ6pCA4MeCylSnFG/utR0QCy9I35CS9OEgBbWOSJsDc55+T3MQBVrbp?= =?us-ascii?Q?ELFvueZdZFckz+0ZmbeJgtPD2mVvA3YsAmPlopkLahVcElARObiqxdi9CgX1?= =?us-ascii?Q?ebnQO+HlXj8sdRQLlJMot4iVC3k/wwknjuLwqZnC8ifPJsVHvS9serp16ZWJ?= =?us-ascii?Q?bkoaeoPgVu1/9CUAt2iPwXdYY0c7FLmMCv0YSZcRvamdxe2VNNF0x1vUx0od?= =?us-ascii?Q?nNLmfDMb3mZvzd1vvjqDtnDNxyJkVb2s/aLe6SDKrjFc9crqI4OI/Nz4tGmS?= =?us-ascii?Q?IeWrIIfA5Z41qdPJKQl47gkqJYecWR4yVrLu9Pqe7u4hIBVdzBX8zSnZuwlP?= =?us-ascii?Q?As9DCOUeiRS3OHgAG/6VPtqnuM5NEsPvXV/K8kpaSn5/t5yxhToKpcgVWl3Y?= =?us-ascii?Q?nNbGp2K2xZ9XOVMYwYUat0TgkBwAH6HRm8ECRcFtGZ7n3wol9vSrwWbVwhIZ?= =?us-ascii?Q?du9X85UQuc6szHXcdXSoVVL5ZA/EiuLQcqIFNPpXwJ9GQtaXJ1+4gNYY/QZO?= =?us-ascii?Q?ZF6mgJ5B+UQqcMyMvnhd335sCDmD6W3nrqcWHyxcegDLDf0uW2FxJy2ZPOWL?= =?us-ascii?Q?zoZHWkS/a2Yfu0FeWOSgnBs3K1jib/HH9xiZtm+Zsu2ZxY6bf9SMfJe9pr9+?= =?us-ascii?Q?igHB0g2iEJ+wJ6C1KN9iIuVtgm4IrTVezJAocaVEXcPsyCgvZN7JMFSoYnR4?= =?us-ascii?Q?qQRXbJUTgY0/Zc9DLq1qxOBS/NArRUF05hr3Z3mj7aOZwXsahFi0IwVYoata?= =?us-ascii?Q?B63UouhY++aGcWj1IONh7YZUKCCp4kTAppM0416qEjjSPlb5SZ4/RdGVpKDP?= =?us-ascii?Q?7Pm2zN9h1KHzLfbRxjMr/N9S8HE2R/bwLgOe4JCvrETa?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: PgccVJO6Cf+vG2dLNIZxOMNZJ27AvqP1w5yw+Rv1wuCv8PN0tBYcjV2aGfAzu4SKQPewwBh8sb6Cz+S8jS4hljEYnVonlLdt2d6k27Bv5HDx0EDcy0Yew5WlCke4I/zBIVm1uCsPlke2TFuoEcJut7eo86zuY/JDz6p9i7AE4qKEtHwDcIbjYPVxEcNDV0VJt6C62Or8shWP59yVZD+K9RpjP5ynAatBexeSyQGPem+3ZgJeXVN0aeV+YzsMdCmIPaiTwKroowJPaxHg80VCIn2ox2wnNAL6IUB290EYu8Q98KRjXYV8GSZGRv0RvuQpSDm3s0xIJu6ZDije02hVky4kfB4bmyi4Wh8WdRLuQcsGjiY3n7krXb5qCHWPW0D/DA0aLi5SmCE/v5jgfoCrZQtIA4ir1jOdRUdMmpzVmjN+owhBl2fFVZF42u3Ij9lrpjU5fxxGPJ/tFJNLbA5yQqlSLCjcFPKSKPiYGGFnRmtw+evaxhViOJYeRKSKt3H6qAPhs9jugJc6yGGybH5ueLUbisdbiwEa4DKFOpof6Dx+kxllhW03reHVH7em755TXCRPd1uHpMYT4CVYZgaIM98pYsGM054Z7Ak/ieIJKrA= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 31c2fb98-dea2-4bdd-a82a-08dc196173e7 X-MS-Exchange-CrossTenant-AuthSource: SA2PR10MB4636.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2024 02:42:33.3146 (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: nH2knE3NNPLTGF6vkS290TZLn2qvMwP2fPy895aQ+T8p8xN39qoQ7rUH/0kutRBbQGLtlzJr9nrwAr+RNgPVObtgdBVx9LhzUR9XCJCaTuI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB5662 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-19_12,2024-01-19_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 phishscore=0 suspectscore=0 mlxlogscore=999 adultscore=0 bulkscore=0 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2401200020 X-Proofpoint-ORIG-GUID: udXqz9XUv0mRFRZlWKfs1aO2p9YjuhUN X-Proofpoint-GUID: udXqz9XUv0mRFRZlWKfs1aO2p9YjuhUN X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_LOW,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: 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