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 576E2385E440 for ; Thu, 22 Jul 2021 12:26:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 576E2385E440 Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-493-yBbBog_mNhq_7cfovLQkKg-1; Thu, 22 Jul 2021 08:26:32 -0400 X-MC-Unique: yBbBog_mNhq_7cfovLQkKg-1 Received: by mail-qk1-f200.google.com with SMTP id e13-20020a37e50d0000b02903ad5730c883so3951190qkg.22 for ; Thu, 22 Jul 2021 05:26:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=VoEM1jcwBuMQnHkZVweesotzawnS1PxS9bjRwM1APmc=; b=A5GixeQanVv+LvxyJPPcs9/PWDjocVgE9MY904ieQOOcI/npKNJIZcD54e15I3UZxu ByjVEzxiNsEYztyuYghvAyN9SDJtbqt2VGHiXPCVV1AnXW9NIdX+5ZpmNE6GB0IU9C8L fK6pikV87v3SpK4gJaGSYoZ776W4VPZj0c9saMReIq4ZaAtktJTwlP1iPQ7aGzJU+kkQ dN4yuKHHjiqGwYnz1Mab8HMEBEuLBp6E3KmbxcEmoZ2ObVj3SHVGVupPg1vo2MzwSx2x rOsVjMWnU2sfjjUvAEBvqnJe1XYCIGnmd1Z6peKtWPAcOPYPZGKtZyboEUvm2b3d+5ai ZESA== X-Gm-Message-State: AOAM530Y/KYTuwnv+hzj1Jf1qdkzn3iQuRg6cLwizjbHI9z05X9vObXV GNFsRhTTKkkYoI2wF9pbwR/YaIY2g8OQldBv3gK1ORsPiLKnKS6bAbT4drRIPlpgCOExiS6KPv5 +CSl+qq+GvK7n264L2h2l X-Received: by 2002:a0c:c350:: with SMTP id j16mr41057325qvi.51.1626956791983; Thu, 22 Jul 2021 05:26:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwtd82cqpfaadaBWcGTROQtiMGBPvq2sL3wqVbm1kEbULGopQvvGFoTR/Rj33/lkjNoRIcqFw== X-Received: by 2002:a0c:c350:: with SMTP id j16mr41057319qvi.51.1626956791867; Thu, 22 Jul 2021 05:26:31 -0700 (PDT) Received: from [192.168.1.16] (198-84-214-74.cpe.teksavvy.com. [198.84.214.74]) by smtp.gmail.com with ESMTPSA id k15sm9340011qko.84.2021.07.22.05.26.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 22 Jul 2021 05:26:31 -0700 (PDT) Subject: Re: [PATCH v10 01/11] Make mcheck tests conditional on GLIBC_2.23 or earlier To: Siddhesh Poyarekar , libc-alpha@sourceware.org Cc: dj@redhat.com, fweimer@redhat.com References: <20210719184637.1225275-1-siddhesh@sourceware.org> <20210719184637.1225275-2-siddhesh@sourceware.org> From: Carlos O'Donell Organization: Red Hat Message-ID: Date: Thu, 22 Jul 2021 08:26:30 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210719184637.1225275-2-siddhesh@sourceware.org> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=unavailable 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-List-Received-Date: Thu, 22 Jul 2021 12:26:35 -0000 On 7/19/21 2:46 PM, Siddhesh Poyarekar wrote: > 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. Fixes the < 2.24 check correctly. OK for 2.34. Tested without regression on x86_64 and i686. 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 \ > -- Cheers, Carlos.