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 2226C3858418 for ; Thu, 7 Jul 2022 20:24:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2226C3858418 Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 267KCYNj015405 for ; Thu, 7 Jul 2022 20:24:37 GMT Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3h4ubyx6br-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 07 Jul 2022 20:24:37 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 267KBKYt015927 for ; Thu, 7 Jul 2022 20:24:36 GMT Received: from nam04-dm6-obe.outbound.protection.outlook.com (mail-dm6nam04lp2042.outbound.protection.outlook.com [104.47.73.42]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com with ESMTP id 3h4ud656rr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 07 Jul 2022 20:24:36 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FZSvU4tkQL4S7mKFqCW+mHI/r1TBhE8L5bNSdzstG0KyW8xQK9iVK/ffmp4y6NrXjbBVZ+6NoAHOGV5TqWpxni1mjjV1CFZaD13hybhtjbJj0yOyYKaa4pZD7tnC0QPNsNGeZjMRJeK+JQyxPDl4eRCj92xllmtlABlH/jAVFmGGDFRwBZmdjuyxraD7XnID99OVH2E+rzAUCgnYNkOg+U62o0+FDS00Cuklf9y8KkJhD6eDg8kgGcS7SHKTAk1cD9ySuW4mt26l6+v2Tt2te3fiNhtJ/CWGMQ1dfsuWjsZlW/6mexX9KQLz4bs4CtOD2JxVyep0Rfwx+k3r5301/g== 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=+X2gI2gPV6BMQ2Ti0EioHQPPCoVkbkX96DDGQQ6CIog=; b=UNMunxh5tECEao69cf+3E5FxrI3VsDtgKghv9dq20PC8r86qdso5RWfaOBmL33iIAAx1mC5qm5JzocyMRHFbwKXC8Zb7NBKzWKLx/y7NiaNx3LrSwJen8leOLg20Akf9N+Cmpm3gued217OF2ItuYC7LS3sLV8p6lHqK3TIWgQO4CoV2tzIYtfKuYWE1cdjtFh5j3/oGWMDVDKk+aPzg3rzw9+ZW/AgL5c/BGhDjyMuF7XTQ9l8zTK8GncPb7H7AdNJ8xM+IdubfcQbRdWFkaZSN0ikUhu300D/sOHVFUJCQcdKAusKuJdNgCsC2w8fEnxIRk7Qy2HPgqspUQvc0wQ== 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 Received: from SA2PR10MB4636.namprd10.prod.outlook.com (2603:10b6:806:11e::10) by CO6PR10MB5443.namprd10.prod.outlook.com (2603:10b6:303:13e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.15; Thu, 7 Jul 2022 20:24:34 +0000 Received: from SA2PR10MB4636.namprd10.prod.outlook.com ([fe80::cc8d:db23:414b:ce5f]) by SA2PR10MB4636.namprd10.prod.outlook.com ([fe80::cc8d:db23:414b:ce5f%6]) with mapi id 15.20.5395.021; Thu, 7 Jul 2022 20:24:34 +0000 From: vladimir.mezentsev@oracle.com To: binutils@sourceware.org Subject: [PATCH] gprofng: fix regression in testing for not yet installed version Date: Thu, 7 Jul 2022 13:24:27 -0700 Message-Id: <20220707202427.2746758-1-vladimir.mezentsev@oracle.com> X-Mailer: git-send-email 2.27.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SA0PR13CA0027.namprd13.prod.outlook.com (2603:10b6:806:130::32) To SA2PR10MB4636.namprd10.prod.outlook.com (2603:10b6:806:11e::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2536a3b6-2bda-4e86-2b47-08da6056b48b X-MS-TrafficTypeDiagnostic: CO6PR10MB5443:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w08oplRKHEePx5qTOUOrdGGBAZ2C35KsfgM5ztU+l/IrawMgjq9837QDpvSzj/nCHO4pnDHjCZCBOkM+SGxJ1yUljT23W+x6jGThkCDgj6m8uZNTkHxrvQjKpWtWCpBR7QCqikaXUzbw1cFIvnzck5XxiSFb48OzRPwzEEeYUUDZrsBNuYgWIcmjbJP/+ybnFXBjbugH/wVEhQwxLnX8Ai1wrF5rNBwvzLnZgXwB+PJSJiTJsrLSzqc9zjSXOyJhvHXbbcYfEOxNv9O3LttYkauxNgringtGGj8ZO3FZEWl3wx962X6iJq7YHqYsfuBLM2o8V54LRYIe1Vm9JmXQzuqkYM22FI19Z/er3X77Frq+aPFiutrAbBNbH/TJ56R1eN0erTFJYNzldzOU161YKqzcgIooblFCOPymPcByTVNaJ/YBqppwkL9q3W2Pqa9KHkaU3ABLuX15CITUw7oGhmKor1tjOkSGnTy9VwQhpCgSHPVLx3rd0DYpM6btc/ueC5n3+YaPx9anEKytPRvPXOD2/dfZl+xbK0zQ8WIFOvsCCcKs8KCI4jEk+MsGKs/+b5NRShhDUpUDHBy3yg77aSa/rKjRJmNyy2td8ZvNK8JJeNHnNr5v2oiy4VM6Gvrs5p+ApmN+1s50TZu9iO4Iu4S3pyIJ5DK8yeXj7BLACGw6pFI1e9SZkhcetYYm7PqRXHu9dYW0oS/GZqqZMBq4hgiKTHutE3xgSCWr3gwiGWuKsyeNdkoaj6rXdxtgz6lC 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:(13230016)(366004)(376002)(136003)(396003)(39860400002)(346002)(478600001)(6486002)(86362001)(36756003)(38100700002)(6506007)(6666004)(52116002)(6512007)(9686003)(316002)(6916009)(8676002)(66476007)(66556008)(66946007)(2616005)(41300700001)(1076003)(186003)(2906002)(5660300002)(8936002)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?yVeAXlDQOfIDZr8M8K8Ony9MppgBowLGT0sZ1VkRg10ObkMeFT+kzR6G5BU4?= =?us-ascii?Q?3CtVnaqBKwNPKAyv+N9+oMYOzt7oCBLcbMP6NtqGa1iCValHKpBnd9zv+6sz?= =?us-ascii?Q?vPrS8Txe/l5lMF01YyuqB9ePhTuEfKUaoB05x2lIxu4xuxADL3G3Fd6CW7aU?= =?us-ascii?Q?vN7XCtyXYiY51rjYWeL+bgx9WaPRQbf+HxChApPUQ/NaRvJx2Cl0NUSDJq3r?= =?us-ascii?Q?9SHZh56QcXJar9UIqfL5QlhBCcd2R2yi7ROg522Wq9LSAY71ij0pgx5/nUb2?= =?us-ascii?Q?/szeL60A+PPXyjwzYiaUiLOiUuEKsNAYkk2AQoVlFOGI4cj9k59FJHCP9MVe?= =?us-ascii?Q?mkMKNUtxpSDQltyKP6pGTN2KrCZDyGfLMenwDRhJBjmXqRhnceYdfUJXZXvZ?= =?us-ascii?Q?VmOMW09bSgU+IyZEfjewlmsN1NrD3ciFyiD6UWahnR90nRBsYPOdJFThGpbv?= =?us-ascii?Q?YNBpV2hv2baCUV6LS7yuSFOOSMETYenBNNKV5A85A4VcXLVBgwM870+qoAi5?= =?us-ascii?Q?khDibwLL5IzNJrcXO80wVLW/8FH39EGDLbQfLMa7FoOiBY1obQ80mRMhrE7F?= =?us-ascii?Q?C87xZq5237MY1PauZWqPkltEsT3+lpWMlmV0I59YHEGtM1mPmVsLKViV6Umz?= =?us-ascii?Q?AY5psgQPzIozycEUX+VRrlgM/d+xrhcii6Rta2OTkSR2ddldHdaKSWEszoAj?= =?us-ascii?Q?3OScBawLu6WsaLhY81+qrU2HKgQM7sBMVwoME70EevFmCAjzeV7Smi1K5YFD?= =?us-ascii?Q?lmzLBwyK76qavpMkXvT/Lr6EMJZq1QGBdrd2AjPTZuXwNiCahbjyBJaOKu7+?= =?us-ascii?Q?6Jq9N1tOWJOgny0MaW0E5bRupu/sYRGLr46AaXSB7hfUsKD9w+kP1QZETllr?= =?us-ascii?Q?tQmyHt5SVmbEfbIPeLPVHNikVRh0qjlNRlT4gtm7/3ruGgrPn+ICpLzeGm4A?= =?us-ascii?Q?FVWOzZsBkOQS3U9xvTC5i53T3DBPk7CzqQ4m3hM/qG9bLzG2CQ9fhyGrfOBQ?= =?us-ascii?Q?bPHFajDxhPQo4zPFXUq7u6OF/MbAXeZNdZs4lzLYFY1Z94iGNL+/Wl7h0mkP?= =?us-ascii?Q?aS2sqGMpu9z7ht3SDqru3cFUccYMSCsAXYmTeSip2zp1V1oZN3AOa3KbVMem?= =?us-ascii?Q?tewzeKO5YlQKieVOqNPcLiK+h3XwDa8BLcPBEqAdgiTXheDRN3gPb8eJXaF+?= =?us-ascii?Q?Y8AV3a/DlCk7wD/v+2lVHNggTFmFqWg62IgfkwBfhCJVO+EYBi48H/2sAoIC?= =?us-ascii?Q?sMhFuDfsUGBRYwO6PRyv33wERa8HqLqgwWMVR4MYmnM+OoDaJskUrqBhzWJl?= =?us-ascii?Q?hW9YhzQSQ+ax8fYyKtGSPKSlrm/RTJtGytOiICa2mSL8mOFuypZ3eQmmmJD0?= =?us-ascii?Q?yG3NV7vhSGAR2l+WZ3LngCAnKB5IpS730OJ8PUult8xkL31Fl2F/3ttQBsbz?= =?us-ascii?Q?L8tNS34sX6+XCH4Bpt1aeBTBcDHFaMkyEsKGFzTQF9y7bmj6gsBR99yISsUH?= =?us-ascii?Q?fDYQ4xi+fpRh2clR0h9FKjGXkZBmmmQe2uRNtiDM3Nj7wpiYyg2Mw8Y+W23z?= =?us-ascii?Q?NfKp2m+6UzQsQr84JCUF2/oF/cGP/cHrid0mMBxu0fGXvQu//hfY2JqBjYFu?= =?us-ascii?Q?AtvbJiGwu2NxZSWhJJJ9VRKHNxtl30KhYw+UWZ18lXhc?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2536a3b6-2bda-4e86-2b47-08da6056b48b X-MS-Exchange-CrossTenant-AuthSource: SA2PR10MB4636.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jul 2022 20:24:34.0225 (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: O+NFI8//g8qDoQzgnD9Jb0yxvJo/gMCVe7gDUo5ufeQIDcncKEmR2V8/+VBcxhyFHKPOA5Dga5E9YPdpDnDA5mkkIOJWof81QKw/d5sa7rs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5443 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517, 18.0.883 definitions=2022-07-07_17:2022-06-28, 2022-07-07 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 suspectscore=0 spamscore=0 mlxlogscore=999 phishscore=0 malwarescore=0 mlxscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000 definitions=main-2207070081 X-Proofpoint-ORIG-GUID: AOduaJpFW7HtievIhLFGh41ilmFy4My0 X-Proofpoint-GUID: AOduaJpFW7HtievIhLFGh41ilmFy4My0 X-Spam-Status: No, score=-12.2 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_H2, 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 X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jul 2022 20:24:40 -0000 From: Vladimir Mezentsev gprofng/ChangeLog 2022-07-07 Vladimir Mezentsev * src/Settings.cc (Settings::read_rc): Read environment variable GPROFNG_SYSCONFDIR. * testsuite/lib/Makefile.skel: Export GPROFNG_SYSCONFDIR. * testsuite/gprofng.display/display.exp: Shorten the list of tests. --- gprofng/src/Settings.cc | 5 ++++- gprofng/testsuite/gprofng.display/display.exp | 22 ++++--------------- gprofng/testsuite/lib/Makefile.skel | 3 +++ 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/gprofng/src/Settings.cc b/gprofng/src/Settings.cc index 39cb806dd4e..572997f8a88 100644 --- a/gprofng/src/Settings.cc +++ b/gprofng/src/Settings.cc @@ -407,7 +407,10 @@ Settings::read_rc (bool ipc_or_rdt_mode) free (rc_path); // Read system-wide file - rc_path = dbe_sprintf (NTXT ("%s/gprofng.rc"), SYSCONFDIR); + const char *sysconfdir = getenv("GPROFNG_SYSCONFDIR"); + if (sysconfdir == NULL) + sysconfdir = SYSCONFDIR; + rc_path = dbe_sprintf (NTXT ("%s/gprofng.rc"), sysconfdir); if (access (rc_path, R_OK | F_OK) != 0) { StringBuilder sb; diff --git a/gprofng/testsuite/gprofng.display/display.exp b/gprofng/testsuite/gprofng.display/display.exp index dfb383e9fc6..8ba03935867 100644 --- a/gprofng/testsuite/gprofng.display/display.exp +++ b/gprofng/testsuite/gprofng.display/display.exp @@ -30,38 +30,24 @@ switch $pltf { # dir cflags gprofflags Others set table { {"jsynprog" "-g -Wall" "-p on -j on"} - {"mttest" "" ""} - {"mttest" "-g -Wall" "-p on"} {"mttest" "-g -O0" "-p on"} - {"mttest" "-g -O" "-p on"} - {"mttest" "-g -O" "-h on"} - {"mttest" "-g -O" "-h on"} - {"mttest" "-g -O" "-p on -h on"} - {"synprog" "" ""} - {"synprog" "-g" "-p on"} + {"mttest" "-g -O0" "-p on -h on"} {"synprog" "-g -O0" "-p on"} - {"synprog" "-g -O" "-p on"} - {"synprog" "-g" "-p on -h on"} - {"synprog" "-g -O0" "-p on -h on"} - {"synprog" "-g -O" "-p on -h on"} + {"synprog" "-g -O0" "-p on -h on"} } } aarch64 { set table { {"jsynprog" "-g -Wall" "-p on -j on"} - {"mttest" "" ""} - {"mttest" "-g -Wall" "-p on"} {"mttest" "-g -O0" "-p on"} - {"mttest" "-g -O" "-p on"} - {"synprog" "" ""} - {"synprog" "-g" "-p on"} - {"synprog" "-g -O" "-p on"} + {"synprog" "-g -O0" "-p on"} } } default { # Columns in the table represent: # dir cflags gprofflags Others set table { + {"jsynprog" "" ""} {"mttest" "" ""} {"synprog" "" ""} } diff --git a/gprofng/testsuite/lib/Makefile.skel b/gprofng/testsuite/lib/Makefile.skel index 7810ba7ed7a..157f6f60c84 100644 --- a/gprofng/testsuite/lib/Makefile.skel +++ b/gprofng/testsuite/lib/Makefile.skel @@ -42,6 +42,9 @@ DISPLAY_LOG = display.log gprofng_dir := $(shell dirname $$(find ../root -name libgprofng.so.0 | head -1)) export LD_LIBRARY_PATH := $(gprofng_dir):$(gprofng_dir)/.. +# Set GPROFNG_SYSCONFDIR to find out gprofng.rc: +export GPROFNG_SYSCONFDIR := $(srcdir)/../../../src + .PHONY: all collect compare clobber clean all: compare -- 2.27.0