From patchwork Thu Jul 22 14:01:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 44455 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 4F6953865C27 for ; Thu, 22 Jul 2021 14:01:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4F6953865C27 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1626962516; bh=plR2bgqX5x2LKZtsDQh1acd53PDdAOcvija4zZTP/vI=; 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=SPVI/8iDjMdm4vV/It6lLEjnmxcEIyAPVWyplBqpJ+1qUXclbkMt1e1LRNFC2FpNj BuPxXBS6Srb+WfQzWFylU5qqkqxjnGrpEteT0HBbObfb72V+cvMGvvti36/czxWsm6 dWm2x6OxVI1E/VSswjTnZNzckREQ8dA2Lwuie/QA= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from dormouse.elm.relay.mailchannels.net (dormouse.elm.relay.mailchannels.net [23.83.212.50]) by sourceware.org (Postfix) with ESMTPS id 577EE385741D for ; Thu, 22 Jul 2021 14:01:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 577EE385741D 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 BBDBE6430BF; Thu, 22 Jul 2021 14:01:32 +0000 (UTC) Received: from pdx1-sub0-mail-a10.g.dreamhost.com (100-96-27-225.trex-nlb.outbound.svc.cluster.local [100.96.27.225]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 0AA41642A67; Thu, 22 Jul 2021 14:01:31 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from pdx1-sub0-mail-a10.g.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384) by 100.96.27.225 (trex/6.3.3); Thu, 22 Jul 2021 14:01:32 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Inform-Troubled: 1e8c6e0c467069e8_1626962492481_1207130417 X-MC-Loop-Signature: 1626962492481:1719764192 X-MC-Ingress-Time: 1626962492480 Received: from pdx1-sub0-mail-a10.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a10.g.dreamhost.com (Postfix) with ESMTP id BB9177EFCE; Thu, 22 Jul 2021 07:01:30 -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-a10.g.dreamhost.com (Postfix) with ESMTPSA id E5CEF7EFC9; Thu, 22 Jul 2021 07:01:27 -0700 (PDT) X-DH-BACKEND: pdx1-sub0-mail-a10 To: libc-alpha@sourceware.org Subject: [PATCH] Exclude static tests for mcheck and malloc-check Date: Thu, 22 Jul 2021 19:31:15 +0530 Message-Id: <20210722140115.2911835-1-siddhesh@sourceware.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210721190428.dfnqd4lpqdpohy2a@begin> References: <20210721190428.dfnqd4lpqdpohy2a@begin> 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_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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: Samuel Thibault Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" mcheck and malloc-check no longer work with static binaries, so drop those tests. Reported-by: Samuel Thibault Reviewed-by: Samuel Thibault --- malloc/Makefile | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/malloc/Makefile b/malloc/Makefile index d54285192a..9b70831d38 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -75,7 +75,8 @@ tests-exclude-malloc-check = tst-malloc-check tst-malloc-usable \ tst-compathooks-off tst-compathooks-on # Run all tests with MALLOC_CHECK_=3 -tests-malloc-check = $(filter-out $(tests-exclude-malloc-check),$(tests)) +tests-malloc-check = $(filter-out $(tests-exclude-malloc-check) \ + $(tests-static),$(tests)) # -lmcheck needs __malloc_initialize_hook, which was deprecated in 2.24. ifeq ($(have-GLIBC_2.23)$(build-shared),yesyes) @@ -94,7 +95,7 @@ tests-exclude-mcheck = tst-mallocstate \ tst-malloc_info \ tst-compathooks-off tst-compathooks-on -tests-mcheck = $(filter-out $(tests-exclude-mcheck), $(tests)) +tests-mcheck = $(filter-out $(tests-exclude-mcheck) $(tests-static), $(tests)) endif routines = malloc mcheck mtrace obstack reallocarray \ @@ -290,16 +291,8 @@ $(objpfx)tst-interpose-thread-mcheck: \ $(objpfx)tst-interpose-thread-malloc-check: \ $(objpfx)tst-interpose-aux-thread.o $(shared-thread-library) $(objpfx)tst-interpose-static-nothread: $(objpfx)tst-interpose-aux-nothread.o -$(objpfx)tst-interpose-static-nothread-mcheck: \ - $(objpfx)tst-interpose-aux-nothread.o -$(objpfx)tst-interpose-static-nothread-malloc-check: \ - $(objpfx)tst-interpose-aux-nothread.o $(objpfx)tst-interpose-static-thread: \ $(objpfx)tst-interpose-aux-thread.o $(static-thread-library) -$(objpfx)tst-interpose-static-thread-mcheck: \ - $(objpfx)tst-interpose-aux-thread.o $(static-thread-library) -$(objpfx)tst-interpose-static-thread-malloc-check: \ - $(objpfx)tst-interpose-aux-thread.o $(static-thread-library) tst-dynarray-ENV = MALLOC_TRACE=$(objpfx)tst-dynarray.mtrace \ LD_PRELOAD=$(objpfx)libc_malloc_debug.so