From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2048.outbound.protection.outlook.com [40.107.92.48]) by sourceware.org (Postfix) with ESMTPS id C6A2A38582B0 for ; Thu, 9 Feb 2023 11:26:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C6A2A38582B0 Authentication-Results: sourceware.org; dmarc=fail (p=quarantine dis=none) header.from=amd.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=amd.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=frfC37BbP0ryCxOqcPEGJdHor9suzNItgd5wjGR0cnW4RVBFx/geaZUFWVY1HHUVJ3Hr1ChxoCNjbeC7OGwnL4n+zOezIoS7NRI8wdEWNn+1dgok9npdZSYNfj/KPpQCRyGYIACvNg3XRXM1Hf78IZC3MWHriirNr4wsaD8mt7ezRcGYQh1q44QRqBK1KNkXIlP37YgWqBxLwX66i6OrLzrlKI11bUxYqAlkQgaBmQxt5yf1rTTVib2gzVPtB1OHLMU/H8JVn1BEYbIuVJHWk2tAvPSVNOPmNv/+Fxo/HRLJ5MC+nRBo99mJ2dfVCjmK+gtIqoXQxsPPoxl9Rvb/jQ== 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=lYsK2vxe4W8vcgDt3IaCGySxz58FuOOmneS8T1QIWDY=; b=OL8cebW+wpcv2Ve9JbDGDDZmvWwDKsI8dGLoFStPUJb5m36hNiBiES37TnSkTZl5OXfPPe2DKNgrbJa8Ga+dIMeJ4SZRrpdSm8uuIXeO6ZC4IUHRAstY7hzztiG95LnZ71fYb1b5xu+Zet56FrSd3hYSkFzqYpeVwC1o2j8+4mii9Y/KOtc6gep1MEzS1qVe43yqj2aHYPgQBieT0SPCTHSnrT4fGumd+aHoRhU+lBpdGAMyuOrez6uDv9HFyVXGJAmx7XlQDzbzcAaWxoTz5dLjrY4ntMA5Z6dhdwnMr5bAAROs7GU41weS+0rYuy0890jTuNqxmGd8B17OmNT5YQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=sourceware.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lYsK2vxe4W8vcgDt3IaCGySxz58FuOOmneS8T1QIWDY=; b=QXPs5jMhx8KiBj71rOEI+Gwaiy1MHxq292iaoXNC1ISkYdw8TaaoJtVcOOViSSa5WeWO6j+ZS6Le3cThT/xnNzfsveeZEWZum2exb3brusX3y81ZQBesGgmHvh7iHnVJK+qYOutkMuWrzNqoMHk6EaCfhDxsblifN7VKZSSOMvY= Received: from BLAPR03CA0122.namprd03.prod.outlook.com (2603:10b6:208:32e::7) by DS0PR12MB7994.namprd12.prod.outlook.com (2603:10b6:8:149::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.19; Thu, 9 Feb 2023 11:26:38 +0000 Received: from BL02EPF00010208.namprd05.prod.outlook.com (2603:10b6:208:32e:cafe::50) by BLAPR03CA0122.outlook.office365.com (2603:10b6:208:32e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.19 via Frontend Transport; Thu, 9 Feb 2023 11:26:38 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BL02EPF00010208.mail.protection.outlook.com (10.167.241.199) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6064.21 via Frontend Transport; Thu, 9 Feb 2023 11:26:38 +0000 Received: from khazad-dum.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Thu, 9 Feb 2023 05:26:36 -0600 From: Lancelot SIX To: CC: , Lancelot SIX Subject: [PATCH v2 5/5] gdb/testsuite: look for hipcc in env(ROCM_PATH) Date: Thu, 9 Feb 2023 11:26:13 +0000 Message-ID: <20230209112613.922098-6-lancelot.six@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230209112613.922098-1-lancelot.six@amd.com> References: <20230209112613.922098-1-lancelot.six@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF00010208:EE_|DS0PR12MB7994:EE_ X-MS-Office365-Filtering-Correlation-Id: cd90f812-897b-4162-3623-08db0a908271 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kpdyzmlRH4IUc68aZK/uip1Olm8rLeSVw/yUB2UCelWeBE1vP+SsPTNHRrrIyJIC24WRKE9w80CfRj+YdONzIum3qObqMRmuMY+kNVCQcgPUX2sBsjSIVpMoMMCCFZmW+UUQsq+NqcSN7hcwUpOJUfzVpLn0oyC5eyBPfx1E2hY9Yl45s76529HH/Dcd9RHifkwBZKazUb2hPdTXILYVjSZvIPAMZUSlj1mmYTxHwrMYUHHgSmsSF+7TZ4sO3euDZEykodw97UyqaugJ6x21yf6Wmzq9J905PGOprdZjAoWZEQGnZ2Fg4jJlnJT/TzNRFnWfFXGvYicpEiE1LSLglkA/TGkY7gerioRqnNg8E9KAAfaISBjkCBbcQVGrULHmng/OHg6EpDXbtmtygGL1Nn+qQLLeLH7WDjBQJMox2uXmTx+CnmGJOaKoL6lw4M9FEUqIxzqCLZYmwOrfhFhGfITNx19PhK+TrLey4J3bTs/tTGyG4HVrGrAgYhgIOBnq7wcb3gNqTLCrkiqTc+7VMCNZ6H76F9hstZPI+OnoNWpSnlKArkScv//VBRLIPH9oITN3gyD9qUnPKYNdosYFb3uhNTH54WyKwOaK72CDPtIWAJ8POxDiCZg+61RZm5b5U37pdsqokX3LCzEu28iGZUeUWNKptX5lFfhgKpfSgq1e/A0f/wnD+em9CMMzWdLlxPBrnx8mp0f0ZSH9vxt6HMoaVr4mYV4RuncaToVCElg= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230025)(4636009)(39860400002)(396003)(346002)(136003)(376002)(451199018)(40470700004)(36840700001)(46966006)(40480700001)(82310400005)(36756003)(83380400001)(356005)(81166007)(40460700003)(36860700001)(82740400003)(26005)(186003)(1076003)(6666004)(16526019)(54906003)(2906002)(478600001)(7696005)(316002)(41300700001)(8936002)(5660300002)(47076005)(2616005)(426003)(336012)(86362001)(8676002)(70206006)(70586007)(4326008)(6916009)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2023 11:26:38.2614 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cd90f812-897b-4162-3623-08db0a908271 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF00010208.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7994 X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,TXREP 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: If the hipcc compiler cannot be found in dejagnu's tool_root_dir, look for it in $::env(ROCM_PATH) (if set). If hipcc is still not found, fallback to "hipcc" so the compiler will be searched in the PATH. This removes the fallback to the hard-coded "/opt/rocm/bin" prefix. This change is done so ROCM tools are searched in a uniform manner. --- gdb/testsuite/lib/future.exp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/lib/future.exp b/gdb/testsuite/lib/future.exp index 5720d3837d5..fa839fcd12b 100644 --- a/gdb/testsuite/lib/future.exp +++ b/gdb/testsuite/lib/future.exp @@ -125,8 +125,11 @@ proc gdb_find_hipcc {} { global tool_root_dir if {![is_remote host]} { set hipcc [lookfor_file $tool_root_dir hipcc] - if {$hipcc == ""} { - set hipcc [lookfor_file /opt/rocm/bin hipcc] + if {$hipcc eq "" && [info exists ::env(ROCM_PATH)]} { + set hipcc [lookfor_file $::env(ROCM_PATH)/bin hipcc] + } + if {$hipcc eq ""} { + set hipcc hipcc } } else { set hipcc "" -- 2.34.1