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 [63.128.21.124]) by sourceware.org (Postfix) with ESMTP id 532D0387085F for ; Fri, 5 Mar 2021 12:57:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 532D0387085F 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-470-RafHq91eMfag3lshmEgm2Q-1; Fri, 05 Mar 2021 07:56:59 -0500 X-MC-Unique: RafHq91eMfag3lshmEgm2Q-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 620FA108BD12 for ; Fri, 5 Mar 2021 12:56:58 +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 BA08660C5F for ; Fri, 5 Mar 2021 12:56:57 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH] resolv: tst-p_secstodate can be a regular test Date: Fri, 05 Mar 2021 13:57:06 +0100 Message-ID: <874khpg3ml.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.12 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_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-List-Received-Date: Fri, 05 Mar 2021 12:57:02 -0000 Now that compat_symbol_reference works for non-internal tests, too. Also do not build and run the tests on architectures which lack the __p_secstodate compatibility symbol. --- resolv/Makefile | 4 +++- resolv/tst-p_secstodate.c | 12 ------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/resolv/Makefile b/resolv/Makefile index 1047bb6ae5..fb19c93026 100644 --- a/resolv/Makefile +++ b/resolv/Makefile @@ -94,7 +94,9 @@ endif # $(build-shared) tests-internal += tst-inet_pton # This test accesses the __p_secstodate compat symbol. -tests-internal += tst-p_secstodate +ifeq ($(have-GLIBC_2.26)$(build-shared),yesyes) +tests += tst-p_secstodate +endif # This test sends millions of packets and is rather slow. xtests += tst-resolv-qtypes diff --git a/resolv/tst-p_secstodate.c b/resolv/tst-p_secstodate.c index 78b3aa1d6f..f45c908025 100644 --- a/resolv/tst-p_secstodate.c +++ b/resolv/tst-p_secstodate.c @@ -25,8 +25,6 @@ #include -#if TEST_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_27) - char *__p_secstodate (unsigned long int); compat_symbol_reference (libresolv, __p_secstodate, __p_secstodate, GLIBC_2_0); @@ -71,14 +69,4 @@ do_test (void) return ret; } -#else - -static int -do_test (void) -{ - return 77; -} - -#endif - #include