From patchwork Mon Jul 19 18:46:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 44413 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 08AF8396E07B for ; Mon, 19 Jul 2021 18:48:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 08AF8396E07B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1626720484; bh=L6rvwoHUhKXZHzY5Z9QEzpVPv7n3G5xP7ERAdyaB9oU=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=YLr162XRPVIetFU6sH9l255LfGY/cZCxcUW6FVPfw/NJXh5FCtYQJsyWSYpFC9evM r/u1Rtmd3RXrNf66euxFplbrGdOw0t8fJuQn7Jqkir2DZvoHO5VAVHh12FxZTkTTEc P9x4ZSlT0RW6qVBu8UzmOSFdnWR8YnOqVRTPSHJQ= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from hamster.birch.relay.mailchannels.net (hamster.birch.relay.mailchannels.net [23.83.209.80]) by sourceware.org (Postfix) with ESMTPS id 40EDC396E400 for ; Mon, 19 Jul 2021 18:47:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 40EDC396E400 X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 4283F840127; Mon, 19 Jul 2021 18:47:11 +0000 (UTC) Received: from pdx1-sub0-mail-a73.g.dreamhost.com (100-101-162-68.trex-nlb.outbound.svc.cluster.local [100.101.162.68]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 156198400C6; Mon, 19 Jul 2021 18:47:02 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from pdx1-sub0-mail-a73.g.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384) by 100.101.162.68 (trex/6.3.3); Mon, 19 Jul 2021 18:47:10 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Battle-Shelf: 1826ad0b16b63b48_1626720422343_335452325 X-MC-Loop-Signature: 1626720422343:3398440521 X-MC-Ingress-Time: 1626720422343 Received: from pdx1-sub0-mail-a73.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a73.g.dreamhost.com (Postfix) with ESMTP id BEE2C7EC9D; Mon, 19 Jul 2021 11:47:01 -0700 (PDT) Received: from rhbox.intra.reserved-bit.com (unknown [1.186.101.110]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a73.g.dreamhost.com (Postfix) with ESMTPSA id A14208A6A0; Mon, 19 Jul 2021 11:46:57 -0700 (PDT) X-DH-BACKEND: pdx1-sub0-mail-a73 To: libc-alpha@sourceware.org Subject: [PATCH v10 01/11] Make mcheck tests conditional on GLIBC_2.23 or earlier Date: Tue, 20 Jul 2021 00:16:27 +0530 Message-Id: <20210719184637.1225275-2-siddhesh@sourceware.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210719184637.1225275-1-siddhesh@sourceware.org> References: <20210719184637.1225275-1-siddhesh@sourceware.org> MIME-Version: 1.0 X-Spam-Status: No, score=-3494.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_NONE, KAM_DMARC_STATUS, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NEUTRAL, 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: Siddhesh Poyarekar via Libc-alpha From: Siddhesh Poyarekar Reply-To: Siddhesh Poyarekar Cc: fweimer@redhat.com Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Targets with base versions of 2.24 or later won't have __malloc_initialize_hook because of which the tests will essentially be the same as the regular malloc tests. Avoid running them instead and save time. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- malloc/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/malloc/Makefile b/malloc/Makefile index 47369b6084..6cac2e5d8d 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -78,6 +78,8 @@ tests-exclude-malloc-check = tst-malloc-check tst-malloc-usable \ # Run all tests with MALLOC_CHECK_=3 tests-malloc-check = $(filter-out $(tests-exclude-malloc-check),$(tests)) +# -lmcheck needs __malloc_initialize_hook, which was deprecated in 2.24. +ifeq ($(have-GLIBC_2.23)$(build-shared),yesyes) # Tests that don't play well with mcheck. They are either bugs in mcheck or # the tests expect specific internal behavior that is changed due to linking to # libmcheck.a. @@ -100,6 +102,7 @@ tests-exclude-mcheck = tst-mallocstate \ tst-reallocarray tests-mcheck = $(filter-out $(tests-exclude-mcheck), $(tests)) +endif routines = malloc morecore mcheck mtrace obstack reallocarray \ scratch_buffer_dupfree \