From patchwork Mon Aug 9 21:26:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Geissler X-Patchwork-Id: 44619 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 86C0A393AC0C for ; Mon, 9 Aug 2021 21:27:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 86C0A393AC0C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1628544429; bh=WPnx/emJJGb8OhRVG0LOKSfFLrBpvOMCLqAl7q5zW/c=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=P4wCF9NyLOZJnRZJPPy774iYmp9D038OBzQ+wZU5gVpbhMBTa4E0Qs9KYgaclUmUf q46cGQ4R1PUTpiFEqoOC90BwOhyl9DsG0oaC5QjD9p3mf4HPikxnlnI57fd1rfXl6C eJ8im6pMPM+xYtbxdF/FP8A1pt9i/Zyf0bIboF+Y= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00070.outbound.protection.outlook.com [40.107.0.70]) by sourceware.org (Postfix) with ESMTPS id A9454393AC2E for ; Mon, 9 Aug 2021 21:26:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A9454393AC2E ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LauMhar9EZGS6/n7n7JCvP1VA/BDcalHgct+VHcowQmkWskQi7f9bRyKfM9E875jHPtphgy0/rLPCOLGUTW+N/OfKch6hfv89whIvDbNgSUAzjXm4TA89PZUvHbklRi0m/xmxWAwO1Lt1j7YQQ/sRP8aS+0uobX9l/SqoQQw/0aGuA3ExMnnaupWuAFpeU49k4VOV5UO0++5pxNmGAcQ+TQq4YZLPwqGmWv8SlDxFVfCT+wAJuZCnC3VYiNKtwjAcRUxBW4RkCSVSdKi/HV6HqV5b3+IOrsHdUrWNzM1n5zvqDoCoolhpzs34W2/vwHbh6ZSU3ote+wGIfpN1k6K2A== 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-SenderADCheck; bh=WPnx/emJJGb8OhRVG0LOKSfFLrBpvOMCLqAl7q5zW/c=; b=IzyNR1PgAAAR6sVaXMH6i26a0J8oWP752EsjSWMj/YH0eQD0ABYgd47hYdAQwbqUHbtrk97HEaEMat7D2YXIDdvJ0/nJ5KuIJYWUW+PVmIQGl6eOMTyvMz/uOqniSJLa5VDBt5nwPAM4nhZbMQCePvQFY/AVaxqOoXvqXUeCUlq1PGPl9kklgDQ65StteHm7J2zHVAwky8H/k0OsFHAir49qsFhoGUExVn00BO41o7vdTZhI0+lqgpm1ESZzPAcy4UozPKrZTbRiEr+L5b3+SXd1uccMIbS5FVqIBhtGMBcqZAqVBAWQRWs7HMQmzxDQ416hlFYDj4Oc1xdYHZWhyQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amadeus.com; dmarc=pass action=none header.from=amadeus.com; dkim=pass header.d=amadeus.com; arc=none Received: from PR3PR10MB3772.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:4d::12) by PA4PR10MB4591.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:10c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15; Mon, 9 Aug 2021 21:26:35 +0000 Received: from PR3PR10MB3772.EURPRD10.PROD.OUTLOOK.COM ([fe80::84e9:c93b:af68:b407]) by PR3PR10MB3772.EURPRD10.PROD.OUTLOOK.COM ([fe80::84e9:c93b:af68:b407%8]) with mapi id 15.20.4394.023; Mon, 9 Aug 2021 21:26:35 +0000 To: "libc-alpha@sourceware.org" Subject: [PATCH] Fix tst-ldconfig-ld_so_conf-update and tst-glibc-hwcaps-prepend-cache with custom configure prefix value Thread-Topic: [PATCH] Fix tst-ldconfig-ld_so_conf-update and tst-glibc-hwcaps-prepend-cache with custom configure prefix value Thread-Index: AQHXjWU6SQGGBedb306JUMhf04jYrw== Date: Mon, 9 Aug 2021 21:26:34 +0000 Message-ID: <20210809212606.GA8348@ncerndobedev6097.etv.nce.amadeus.net> Accept-Language: fr-FR, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: Mutt/1.10.1 (2018-07-13) x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 9f53bc50-ffa7-4822-8730-08d95b7c5d70 x-ms-traffictypediagnostic: PA4PR10MB4591: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7219; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 6rP4ksh/2T7bT6/qgS4U/exkgOiw9dcofnpkGBvEtTnkMOWQLdhY7392dnHF30JYjRNhxS3xZmCEeDU+7C/Qdv1zw8EA1ww3KgDBXIB9N4mfwR8a7ANqmH6hq1RTOhgt28IHtkRw7ltakYWt0Yae9XquESLFIPpWJBIlQoBa8gf9Ed3eQxEee2WrHeDb3QV34SYA9dTOeFFXu5y4mDeyYK8AhRlH+28Sh9jJhcZh4/vHtiAkrfFZhpBeV5kGxNPucowI1z/m3rOYomh01aPPiJCRRa/q6AD0+jB9LWbQDaVKNapMNjHQV2aRH4NLhglgnDnkAqsWEs/d+PO0rAqQ3H6iI/UDvtFwm7oZmaCqbgSJ5i2ZKithXz2rJ5+548uSo4Kem1984UB9Wn4MJW5phpvqcA6YjlD7EqLaV/BeMXWvhcZ0f1duAw4WIFTCCnGVFz6z6Hhah3XM0GVXDyqa+zxl3JZ/DVU5drE0Q84IkVSBnGJu+UBms9M2RYC8mz9XIuqJc0KFGCmD7wqljmyTEljQXc8vsmxANLqtbXuc8Y4I2yXjhkmV8G8YGe1viwyYPnD4yIjaemYv/bh7Ftb5nf74uKDXhkcCIAiyvuTk0HlWH1g+sjd2H1/4qAGacjzu8VSz4iwq71cpgwIjxfSph5qq2jARTw8sDWzH0HKc9nbYXcooOxJ5mXDcxlKVfPpArrat5NlIUZTn203+34H1EA== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PR3PR10MB3772.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(366004)(186003)(2906002)(316002)(26005)(86362001)(6506007)(15650500001)(53546011)(508600001)(83380400001)(66556008)(64756008)(66446008)(1076003)(38100700002)(66476007)(122000001)(38070700005)(6512007)(9686003)(8936002)(66946007)(71200400001)(33656002)(6916009)(8676002)(6486002)(5660300002)(76116006); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: 64iSRtdgBAnI9+nbs4dSFdf0axjOwGW0sI7w91HRZLirp+DszRs1di9FnmxDnGBWuu2BCQTD7ofJOhlo0oFF5M36UR6QgouxnLldx74+E8jmb+aG6JiiZez7BcPVFHBlNYSn3HSn/L9NO9C0DXPanmmTDzTxJC9CfCaDTWCnbHelzf+ZY40Y7K6Qu+8mcuX0kSGQNt5zEF+6ikJxZt1gzAc26yDPZnAeIFrtv0DsJKtQf++zWgrf3QzQUsDWSTSznslJmr4tVDTSz18DD5rQBSf3Amsy+wOUWVF1T3YDxBzA04HovHtrPvT31hvXODr6alMzcT5usTbbAmXSQ51tORNpJeVc5PAQYBcNxVV94hfJ77LtJSQa1Q2xEnD7axmgcLPFxVvIobHtAji15j1IivRkfHGVRrqJVDsnHZItZh++otxsG+Mo0pGXObQ7z2jGy2CpCvFt9OsDlve6RsJsvVuuJHDVmWb24tZwWiX2ihnVulOod5s2GrEItlrb5N738FYR4qwBUSZYOj/X41n6Zbvkj7HdLMLte3pj8PWhkKdGJ1Kc4ARJiFF4+RZbmGo2R+q4BFatNqQMqvO8bWn9Rzq+Y7DUn58co9SDNOivql0cpBBRRtxQhlr8lzoH/QgMmhep2pV2JZYOiLiLZW0h8wL+IpNuljYlkSEk9qydM2GNSKnGKHjFsCBtTEgzOh91wYax0O1cKZAHxMDFDHqXyTu6lpfUZay4ApTFnBJooP+Is5iabLrKlADdou7IjAgGHcJ1wNTgwMtB3PFT+9LFD6doBUeRcRzOL9JZ8IIimZP18lVBQ1Yg6OJMvR61zqz+m7ZxcwAzwQ3leGswvIBwZqisCXzpSTihsG0reU3pPmZ8MKaBPomXTb3HVcsD1izTDwFVRCqTsqTgZJJv+oIwKDB0uCRQLprfjAIMsdHl6uMdkrmEQBo5wzPsvMm4Tp7JhcDz5Q53BWrgoh3Ju9ELiAJQj8H8PSBQRx6/MjYMevLXIQJQXJAFhfNMrEqr91fJVDBT8omShdjnff7Q59e1c0In69UhCNed1+FTk0Rl1ubma5MAisVi/X0DsQjQ6u4w85NJHd4Aw2+goo6pnQYlM/1UHdLZyOx2nxUGzDiXgLgf9At9o5DP3NT1I38LGEfQH/y58mBX42uWFxJ/W5piQpevr6vSECicHa4EBjeIix06BIwTqQ1yw4PPYtrHvXvixMfDcqhSMAwNuT9LAc4Kd4S9VyGKY0DDiR3U88RgZBt6cLGhQEH3Ms1AnSBO3SCMsPxSmY8e4itc08s1ssQt+RZbzWZLTsG2xMzSQptOStsoSB+rRl1PxVvXeCkSTD3r x-ms-exchange-transport-forked: True Content-ID: MIME-Version: 1.0 X-OriginatorOrg: amadeus.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PR3PR10MB3772.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 9f53bc50-ffa7-4822-8730-08d95b7c5d70 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Aug 2021 21:26:35.0268 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b3f4f7c2-72ce-4192-aba4-d6c7719b5766 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: EpRD2CXPhijT7GS4VmOxUGZpxJWrqJrA5v3LPS1X+Qqcx706uZQR7YzbzgtWgzaJyvJ7LT0CUi5RhpuiYY0Nm/0wq8Q7DUWPAtDGYmjJJzM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR10MB4591 X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, 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.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Romain GEISSLER via Libc-alpha From: Romain Geissler Reply-To: Romain GEISSLER Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Hi, I have build a recent glibc 2.34 with some non default --prefix value at configure time, and I have two new tests failing: tst-ldconfig-ld_so_conf-update and tst-glibc-hwcaps-prepend-cache. Both hardcodes the patch /etc/ld.so.conf which should take ${prefix} into account. Fixed thusly. I tested this successfully on x86-64. Cheers, Romain From 8005e062750421f44ab9f5c22243f70185a2b682 Mon Sep 17 00:00:00 2001 From: Romain Geissler Date: Mon, 9 Aug 2021 20:11:47 +0000 Subject: [PATCH] Fix tst-ldconfig-ld_so_conf-update and tst-glibc-hwcaps-prepend-cache with custom configure prefix value. --- elf/tst-glibc-hwcaps-prepend-cache.c | 10 +++++++--- elf/tst-ldconfig-ld_so_conf-update.c | 13 ++++++++----- support/Makefile | 3 ++- support/support.h | 2 ++ support/support_paths.c | 7 +++++++ 5 files changed, 26 insertions(+), 9 deletions(-) diff --git a/elf/tst-glibc-hwcaps-prepend-cache.c b/elf/tst-glibc-hwcaps-prepend-cache.c index 153408e14d3..1f0872b918a 100644 --- a/elf/tst-glibc-hwcaps-prepend-cache.c +++ b/elf/tst-glibc-hwcaps-prepend-cache.c @@ -44,9 +44,13 @@ do_test (void) if (dlopen (SONAME, RTLD_NOW) != NULL) FAIL_EXIT1 (SONAME " is already on the search path"); - /* Install the default implementation of libmarkermod1.so. */ - xmkdirp ("/etc", 0777); - support_write_file_string ("/etc/ld.so.conf", "/glibc-test/lib\n"); + { + /* Install the default implementation of libmarkermod1.so. */ + char *conf_path = xasprintf ("%s/ld.so.conf", support_sysconfdir_prefix); + xmkdirp (support_sysconfdir_prefix, 0777); + support_write_file_string (conf_path, "/glibc-test/lib\n"); + free (conf_path); + } xmkdirp ("/glibc-test/lib/glibc-hwcaps/prepend2", 0777); xmkdirp ("/glibc-test/lib/glibc-hwcaps/prepend3", 0777); { diff --git a/elf/tst-ldconfig-ld_so_conf-update.c b/elf/tst-ldconfig-ld_so_conf-update.c index e8bd4c35986..842ab8e25b0 100644 --- a/elf/tst-ldconfig-ld_so_conf-update.c +++ b/elf/tst-ldconfig-ld_so_conf-update.c @@ -33,7 +33,6 @@ #define DSO "libldconfig-ld-mod.so" #define DSO_DIR "/tmp/tst-ldconfig" -#define CONF "/etc/ld.so.conf" static void @@ -64,6 +63,8 @@ do_test (void) { struct support_capture_subprocess result; + char *conf_path = xasprintf ("%s/ld.so.conf", support_sysconfdir_prefix); + /* Create the needed directories. */ xmkdirp ("/var/cache/ldconfig", 0777); xmkdirp (DSO_DIR, 0777); @@ -82,9 +83,9 @@ do_test (void) is not searched. */ TEST_VERIFY_EXIT (dlopen (DSO, RTLD_NOW | RTLD_GLOBAL) == NULL); - FILE *fp = xfopen (CONF, "a+"); + FILE *fp = xfopen (conf_path, "a+"); if (!fp) - FAIL_EXIT1 ("creating /etc/ld.so.conf failed: %m"); + FAIL_EXIT1 ("creating %s failed: %m", conf_path); xfclose (fp); /* Run ldconfig. */ @@ -95,9 +96,9 @@ do_test (void) TEST_VERIFY_EXIT (dlopen (DSO, RTLD_NOW | RTLD_GLOBAL) == NULL); /* Add tst-ldconfig directory to /etc/ld.so.conf. */ - fp = xfopen (CONF, "w"); + fp = xfopen (conf_path, "w"); if (!(fwrite (DSO_DIR, 1, sizeof (DSO_DIR), fp))) - FAIL_EXIT1 ("updating /etc/ld.so.conf failed: %m"); + FAIL_EXIT1 ("updating %s failed: %m", conf_path); xfclose (fp); /* Try to dlopen the same DSO again, we expect this to still fail. */ @@ -111,6 +112,8 @@ do_test (void) /* Finally, we expect dlopen to pass now. */ TEST_VERIFY_EXIT (dlopen (DSO, RTLD_NOW | RTLD_GLOBAL) != NULL); + free (conf_path); + return 0; } diff --git a/support/Makefile b/support/Makefile index a4627817184..af086788527 100644 --- a/support/Makefile +++ b/support/Makefile @@ -219,7 +219,8 @@ CFLAGS-support_paths.c = \ -DSBINDIR_PATH=\"$(sbindir)\" \ -DSLIBDIR_PATH=\"$(slibdir)\" \ -DROOTSBINDIR_PATH=\"$(rootsbindir)\" \ - -DCOMPLOCALEDIR_PATH=\"$(complocaledir)\" + -DCOMPLOCALEDIR_PATH=\"$(complocaledir)\" \ + -DSYSCONFDIR_PATH=\"$(sysconfdir)\" # In support_timespec_check_in_range we may be passed a very tight # range for which we should produce a correct result for expected diff --git a/support/support.h b/support/support.h index 834dba90977..2be56f20e64 100644 --- a/support/support.h +++ b/support/support.h @@ -132,6 +132,8 @@ extern const char support_slibdir_prefix[]; extern const char support_install_rootsbindir[]; /* Corresponds to the install's compiled locale directory. */ extern const char support_complocaledir_prefix[]; +/* Corresponds to the install's etc/ directory. */ +extern const char support_sysconfdir_prefix[]; /* Copies the file at the path FROM to TO. If TO does not exist, it is created. If TO is a regular file, it is truncated before diff --git a/support/support_paths.c b/support/support_paths.c index d18e71e38bb..a0921ce7e90 100644 --- a/support/support_paths.c +++ b/support/support_paths.c @@ -92,3 +92,10 @@ const char support_complocaledir_prefix[] = COMPLOCALEDIR_PATH; #else # error please -DCOMPLOCALEDIR_PATH=something in the Makefile #endif + +#ifdef SYSCONFDIR_PATH +/* Corresponds to the install's etc/ directory. */ +const char support_sysconfdir_prefix[] = SYSCONFDIR_PATH; +#else +# error please -DSYSCONFDIR_PATH=something in the Makefile +#endif