From patchwork Thu Sep 12 16:44:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 1984768 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=E2IYJiKM; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces~incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4X4NZm5G59z1y1l for ; Fri, 13 Sep 2024 02:44:48 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 09D84385843B for ; Thu, 12 Sep 2024 16:44:46 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id AD9A43858D26 for ; Thu, 12 Sep 2024 16:44:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AD9A43858D26 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org AD9A43858D26 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1726159469; cv=none; b=loV4bqTwpDLp2ih5SV8VNEOM4ctJziju7r+WeyeyXnSTGBfNp6KCqSappGJuUkgpyC/hcEUF9fAOStdgssihBUsPAW0wVuxFRbXKcYM7mJyFMMsiVH8UmaPdI2cHxm8geOHBV9OgrPinAAFy4I0o7VDu7CI0ytsl6uglfwAvrrw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1726159469; c=relaxed/simple; bh=nqYHq0fZN/r1wJJGy+fGzJtPtmq06tg46ehvUduxUD8=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=eibkTXZ7gsgDzaaHyEJaouVmjiPqSJLIYs4o0spYXizRwmfIH8kWcEj+IyruLqUBtBgZq2bzdcr0xjxJ1IFS/DtR17quLpD6eXizQ5UT1GnwDFaNUnE3cnbN115M1dC7EcfIluMUilkvyANfrHL2ls/RxP2NaB7IkNOKyxh6BSw= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1726159466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=8U9MPcRNd3I5kU8dTdPMSlXRhbPsT4h4jjs5N/dof74=; b=E2IYJiKMi5ibDm6KpgAmwgtR1aGSges6QKMjVOE2UlrXTIchLg64waba4nJPUvV6iONVyD e30/l2Ugynh9lowhQB6MnIe33iZAjROYH9FwyTfm/DheSOVlBqRJk1pFHVITG6mtCjXYk0 k41FhXlFdNavO5h6TmEK7CAwh3Sp/wA= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-362-GErnnPr8OqinmKjyLsdu5Q-1; Thu, 12 Sep 2024 12:44:25 -0400 X-MC-Unique: GErnnPr8OqinmKjyLsdu5Q-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 640E419560AD for ; Thu, 12 Sep 2024 16:44:24 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.2.16.5]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AA6FC1956052; Thu, 12 Sep 2024 16:44:22 +0000 (UTC) From: Florian Weimer To: Joseph Myers Cc: libc-alpha@sourceware.org, DJ Delorie Subject: [PATCH COMMITTED] support: Fix Hurd build of tst-support_readdir (was: Re: [PATCH v5] support: Add ) In-Reply-To: (Joseph Myers's message of "Thu, 12 Sep 2024 15:51:53 +0000 (UTC)") References: <871q1yfjlo.fsf@oldenburg.str.redhat.com> Date: Thu, 12 Sep 2024 18:44:19 +0200 Message-ID: <87ed5o3jq4.fsf_-_@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~incoming=patchwork.ozlabs.org@sourceware.org * Joseph Myers: > This introduces a testsuite build failure for Hurd ("'struct dirent64' has > no member named 'd_off'"). Sorry about that. I've pushed the fix below. Thanks, Florian Subject: support: Fix Hurd build of tst-support_readdir Check for the availability of the d_off member at compile time, not run time. Fixes commit 1251e9ea49fba9f53bbf4f290f3db90c01931fa7 ("support: Add "). --- support/tst-support_readdir.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) base-commit: 1251e9ea49fba9f53bbf4f290f3db90c01931fa7 diff --git a/support/tst-support_readdir.c b/support/tst-support_readdir.c index c0639571c7..66be94fa80 100644 --- a/support/tst-support_readdir.c +++ b/support/tst-support_readdir.c @@ -39,10 +39,13 @@ do_test (void) e.d_name = NULL; TEST_VERIFY (support_readdir (stream, op, &e)); TEST_COMPARE (e.d_ino, reference->d_ino); - if (support_readdir_offset_width (op) != 0) - TEST_COMPARE (e.d_off, reference->d_off); - else - TEST_COMPARE (e.d_off, 0); +#ifdef _DIRENT_HAVE_D_OFF + TEST_VERIFY (support_readdir_offset_width (op) != 0); + TEST_COMPARE (e.d_off, reference->d_off); +#else + TEST_COMPARE (support_readdir_offset_width (op), 0); + TEST_COMPARE (e.d_off, 0); +#endif TEST_COMPARE (e.d_type, reference->d_type); TEST_COMPARE_STRING (e.d_name, reference->d_name); free (e.d_name);