From patchwork Fri Mar 5 12:57:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 42269 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 5BF833892460; Fri, 5 Mar 2021 12:57:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5BF833892460 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1614949050; bh=AV4btydAXiD3NDPs23M/fYE1g9uox0PxXPdRIreFv/M=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=hNi9YfuSoOra3bHP8P89+Sq8Sp2dv6CjUe0i3r+4mglfA/bTvVN9Yp7IgfUsv7zIS U8oiHJy1UVD3M/aFgiMN5+haU3dYwioUU9rJIKh83mmA8VfqDFf1X2PLOHbDaaHt0m TfUViq9/hjB3xLpjLGh1usTjWfTmrnWm4QMif910= 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 [63.128.21.124]) by sourceware.org (Postfix) with ESMTP id B43BF3874C0A for ; Fri, 5 Mar 2021 12:57:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org B43BF3874C0A Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-528-YykKvN8wNpSscFejbsO7xQ-1; Fri, 05 Mar 2021 07:57:25 -0500 X-MC-Unique: YykKvN8wNpSscFejbsO7xQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 048E8801814 for ; Fri, 5 Mar 2021 12:57:25 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-113-208.ams2.redhat.com [10.36.113.208]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5DE5A614EF for ; Fri, 5 Mar 2021 12:57:24 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH] Linux: misc/tst-ofdlocks-compat can be a regular test Date: Fri, 05 Mar 2021 13:57:33 +0100 Message-ID: <87v9a5ep1e.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.4 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_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Now that compat_symbol_reference works in non-internal tests. Also do not build and run the test at all on architectures which do not have the pre-2.28 symbol version of fcntl. Reviewed-by: Adhemerval Zanella --- sysdeps/unix/sysv/linux/Makefile | 8 +++++++- sysdeps/unix/sysv/linux/tst-ofdlocks-compat.c | 8 -------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 51e28b97ac..8cc03c8145 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -108,7 +108,13 @@ tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \ tst-rlimit-infinity tst-ofdlocks tst-gettid tst-gettid-kill \ tst-tgkill tst-sysvsem-linux tst-sysvmsg-linux tst-sysvshm-linux \ tst-timerfd tst-ppoll tst-futimens tst-utime tst-utimes -tests-internal += tst-ofdlocks-compat tst-sigcontext-get_pc + +# Test for the symbol version of fcntl that was replaced in glibc 2.28. +ifeq ($(have-GLIBC_2.27)$(build-shared),yesyes) +tests += tst-ofdlocks-compat +endif + +tests-internal += tst-sigcontext-get_pc CFLAGS-tst-sigcontext-get_pc.c = -fasynchronous-unwind-tables diff --git a/sysdeps/unix/sysv/linux/tst-ofdlocks-compat.c b/sysdeps/unix/sysv/linux/tst-ofdlocks-compat.c index 9169e3baf8..4af8da123f 100644 --- a/sysdeps/unix/sysv/linux/tst-ofdlocks-compat.c +++ b/sysdeps/unix/sysv/linux/tst-ofdlocks-compat.c @@ -25,7 +25,6 @@ #include #include -#if TEST_COMPAT (libc, GLIBC_2_0, GLIBC_2_28) compat_symbol_reference (libc, fcntl, fcntl, GLIBC_2_0); static char *temp_filename; @@ -86,12 +85,5 @@ do_test (void) return 0; } -#else -static int -do_test (void) -{ - return 77; -} -#endif #include