From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 5C01F383F867 for ; Fri, 5 Mar 2021 12:56:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 5C01F383F867 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-279-RrXh0wd6OL6BiIDrClMmOQ-1; Fri, 05 Mar 2021 07:56:50 -0500 X-MC-Unique: RrXh0wd6OL6BiIDrClMmOQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DA37DE496F for ; Fri, 5 Mar 2021 12:56:49 +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 3E7DD5D9C0 for ; Fri, 5 Mar 2021 12:56:49 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH] posix: tst-spawn4-compat can be a regular test Date: Fri, 05 Mar 2021 13:56:58 +0100 Message-ID: <878s71g3mt.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.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain 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_H3, 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-List-Received-Date: Fri, 05 Mar 2021 12:56:54 -0000 compat_symbol_reference now works for non-internal tests, too. Also stop building and running the tests on those architectures that lack the test symbol versions. --- posix/Makefile | 9 +++++++-- posix/tst-spawn4-compat.c | 8 -------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/posix/Makefile b/posix/Makefile index 2ee5bb6e1d..305ec757cd 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -110,9 +110,14 @@ ifeq ($(have-GLIBC_2.26)$(build-shared),yesyes) tests += tst-glob_lstat_compat endif +# Test for the posix_spawn, posix_spawnp symbol versions replaced in +# glibc 2.15. +ifeq ($(have-GLIBC_2.14)$(build-shared),yesyes) +tests += tst-spawn4-compat +endif + tests-internal := bug-regex5 bug-regex20 bug-regex33 \ - tst-rfc3484 tst-rfc3484-2 tst-rfc3484-3 \ - tst-spawn4-compat + tst-rfc3484 tst-rfc3484-2 tst-rfc3484-3 tests-container := bug-ga2 xtests := tst-getaddrinfo4 tst-getaddrinfo5 tst-sched_rr_get_interval ifeq (yes,$(build-shared)) diff --git a/posix/tst-spawn4-compat.c b/posix/tst-spawn4-compat.c index 77f6ed6c22..30ba0677ba 100644 --- a/posix/tst-spawn4-compat.c +++ b/posix/tst-spawn4-compat.c @@ -27,7 +27,6 @@ #include #include -#if TEST_COMPAT (libc, GLIBC_2_0, GLIBC_2_15) compat_symbol_reference (libc, posix_spawn, posix_spawn, GLIBC_2_2); compat_symbol_reference (libc, posix_spawnp, posix_spawnp, GLIBC_2_2); @@ -66,12 +65,5 @@ do_test (void) return 0; } -#else -static int -do_test (void) -{ - return 77; -} -#endif #include