From patchwork Tue Jun 22 10:20:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 43948 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 470CF388880F for ; Tue, 22 Jun 2021 10:20:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 470CF388880F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1624357253; bh=oh7A7hfdCv2WRokUyqjce43PQAQxwQhID77PUxv4hzk=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=oPRzjulc+qK7r7KgsGLS/rBBdekbjvk9+1zQYhq/KsmJIajPNKvba6O68axVNC3zl UBwbGrR2ZdpOfN63NUeJ3FJ2iwemCu/tCcaU0OfnhHEwrprxjE5+3bKqyDc5g1zo80 FsFO5xovdHoc1QTk0cokwPVRznAsFa5H38ZEzue4= 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 A2ECB385042D for ; Tue, 22 Jun 2021 10:20:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A2ECB385042D 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 7214C642B79 for ; Tue, 22 Jun 2021 10:20:27 +0000 (UTC) Received: from pdx1-sub0-mail-a45.g.dreamhost.com (100-96-27-202.trex.outbound.svc.cluster.local [100.96.27.202]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 8F9CF6427AC for ; Tue, 22 Jun 2021 10:20:26 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from pdx1-sub0-mail-a45.g.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384) by 100.96.27.202 (trex/6.3.3); Tue, 22 Jun 2021 10:20:27 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Cold-Well-Made: 2143092c5a560030_1624357226834_1116321324 X-MC-Loop-Signature: 1624357226834:2464878989 X-MC-Ingress-Time: 1624357226834 Received: from pdx1-sub0-mail-a45.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a45.g.dreamhost.com (Postfix) with ESMTP id 2D5967F609 for ; Tue, 22 Jun 2021 03:20:26 -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-a45.g.dreamhost.com (Postfix) with ESMTPSA id D96477E3CC for ; Tue, 22 Jun 2021 03:20:24 -0700 (PDT) X-DH-BACKEND: pdx1-sub0-mail-a45 To: libc-alpha@sourceware.org Subject: [PATCH][trivial] More mcheck -> malloc-check refactoring Date: Tue, 22 Jun 2021 15:50:13 +0530 Message-Id: <20210622102013.2807141-1-siddhesh@sourceware.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3494.6 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_H2, SPF_HELO_NONE, SPF_NEUTRAL, 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-Patchwork-Original-From: Siddhesh Poyarekar via Libc-alpha From: Siddhesh Poyarekar Reply-To: Siddhesh Poyarekar Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Refactored malloc-check rules for tests that are automatically generated and executed with MALLOC_CHECK_=3. This does not affect codegen and tests run pretty much the same way too, so I'll push this shortly if there are no objections. --- Rules | 20 ++++++++++---------- malloc/Makefile | 30 +++++++++++++++++------------- 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/Rules b/Rules index 082625bb71..c6b635c3f7 100644 --- a/Rules +++ b/Rules @@ -155,7 +155,7 @@ xtests: tests $(xtests-special) else tests: $(tests:%=$(objpfx)%.out) $(tests-internal:%=$(objpfx)%.out) \ $(tests-container:%=$(objpfx)%.out) \ - $(tests-mcheck:%=$(objpfx)%-mcheck.out) \ + $(tests-malloc-check:%=$(objpfx)%-malloc-check.out) \ $(tests-special) $(tests-printers-out) xtests: tests $(xtests:%=$(objpfx)%.out) $(xtests-special) endif @@ -166,7 +166,7 @@ ifeq ($(run-built-tests),no) tests-expected = else tests-expected = $(tests) $(tests-internal) $(tests-printers) \ - $(tests-container) $(tests-mcheck:%=%-mcheck) + $(tests-container) $(tests-malloc-check:%=%-malloc-check) endif tests: $(..)scripts/merge-test-results.sh -s $(objpfx) $(subdir) \ @@ -192,7 +192,7 @@ else binaries-pie-tests = binaries-pie-notests = endif -binaries-mcheck-tests = $(tests-mcheck:%=%-mcheck) +binaries-malloc-check-tests = $(tests-malloc-check:%=%-malloc-check) else binaries-all-notests = binaries-all-tests = $(tests) $(tests-internal) $(xtests) $(test-srcs) @@ -202,7 +202,7 @@ binaries-static-tests = binaries-static = binaries-pie-tests = binaries-pie-notests = -binaries-mcheck-tests = +binaries-malloc-check-tests = endif binaries-pie = $(binaries-pie-tests) $(binaries-pie-notests) @@ -226,8 +226,8 @@ $(addprefix $(objpfx),$(binaries-shared-tests)): %: %.o \ $(+link-tests) endif -ifneq "$(strip $(binaries-mcheck-tests))" "" -$(addprefix $(objpfx),$(binaries-mcheck-tests)): %-mcheck: %.o \ +ifneq "$(strip $(binaries-malloc-check-tests))" "" +$(addprefix $(objpfx),$(binaries-malloc-check-tests)): %-malloc-check: %.o \ $(link-extra-libs-tests) \ $(sort $(filter $(common-objpfx)lib%,$(link-libc))) \ $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit) @@ -264,11 +264,11 @@ $(addprefix $(objpfx),$(binaries-static-tests)): %: %.o \ $(+link-static-tests) endif -# All mcheck tests will be run with MALLOC_CHECK_=3 -define mcheck-ENVS -$(1)-mcheck-ENV = MALLOC_CHECK_=3 +# All malloc-check tests will be run with MALLOC_CHECK_=3 +define malloc-check-ENVS +$(1)-malloc-check-ENV = MALLOC_CHECK_=3 endef -$(foreach t,$(tests-mcheck),$(eval $(call mcheck-ENVS,$(t)))) +$(foreach t,$(tests-malloc-check),$(eval $(call malloc-check-ENVS,$(t)))) ifneq "$(strip $(tests) $(tests-internal) $(xtests) $(test-srcs))" "" # These are the implicit rules for making test outputs diff --git a/malloc/Makefile b/malloc/Makefile index f606c70fed..3162301fba 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -70,13 +70,11 @@ test-srcs = tst-mtrace # These tests either are run with MALLOC_CHECK_=3 by default or do not work # with MALLOC_CHECK_=3 because they expect a specific failure. -tests-exclude-mcheck = tst-malloc-check tst-malloc-usable \ - tst-interpose-nothread tst-interpose-static-nothread \ - tst-interpose-static-thread \ +tests-exclude-malloc-check = tst-malloc-check tst-malloc-usable \ tst-mxfast tst-safe-linking # Run all tests with MALLOC_CHECK_=3 -tests-mcheck = $(filter-out $(tests-exclude-mcheck),$(tests)) +tests-malloc-check = $(filter-out $(tests-exclude-malloc-check),$(tests)) routines = malloc morecore mcheck mtrace obstack reallocarray \ scratch_buffer_dupfree \ @@ -117,11 +115,11 @@ $(objpfx)tst-malloc-thread-exit: $(shared-thread-library) $(objpfx)tst-malloc-thread-fail: $(shared-thread-library) $(objpfx)tst-malloc-fork-deadlock: $(shared-thread-library) $(objpfx)tst-malloc-stats-cancellation: $(shared-thread-library) -$(objpfx)tst-malloc-backtrace-mcheck: $(shared-thread-library) -$(objpfx)tst-malloc-thread-exit-mcheck: $(shared-thread-library) -$(objpfx)tst-malloc-thread-fail-mcheck: $(shared-thread-library) -$(objpfx)tst-malloc-fork-deadlock-mcheck: $(shared-thread-library) -$(objpfx)tst-malloc-stats-cancellation-mcheck: $(shared-thread-library) +$(objpfx)tst-malloc-backtrace-malloc-check: $(shared-thread-library) +$(objpfx)tst-malloc-thread-exit-malloc-check: $(shared-thread-library) +$(objpfx)tst-malloc-thread-fail-malloc-check: $(shared-thread-library) +$(objpfx)tst-malloc-fork-deadlock-malloc-check: $(shared-thread-library) +$(objpfx)tst-malloc-stats-cancellation-malloc-check: $(shared-thread-library) # These should be removed by `make clean'. extra-objs = mcheck-init.o libmcheck.a @@ -252,13 +250,19 @@ $(foreach o,$(all-object-suffixes),$(objpfx)malloc$(o)): arena.c hooks.c $(tests:%=$(objpfx)%.o): CPPFLAGS += -DTEST_NO_MALLOPT $(objpfx)tst-interpose-nothread: $(objpfx)tst-interpose-aux-nothread.o +$(objpfx)tst-interpose-nothread-malloc-check: \ + $(objpfx)tst-interpose-aux-nothread.o $(objpfx)tst-interpose-thread: \ $(objpfx)tst-interpose-aux-thread.o $(shared-thread-library) -$(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-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-malloc-check: \ + $(objpfx)tst-interpose-aux-thread.o $(static-thread-library) tst-dynarray-ENV = MALLOC_TRACE=$(objpfx)tst-dynarray.mtrace $(objpfx)tst-dynarray-mem.out: $(objpfx)tst-dynarray.out @@ -273,6 +277,6 @@ $(objpfx)tst-dynarray-fail-mem.out: $(objpfx)tst-dynarray-fail.out $(objpfx)tst-malloc-tcache-leak: $(shared-thread-library) $(objpfx)tst-malloc_info: $(shared-thread-library) $(objpfx)tst-mallocfork2: $(shared-thread-library) -$(objpfx)tst-malloc-tcache-leak-mcheck: $(shared-thread-library) -$(objpfx)tst-malloc_info-mcheck: $(shared-thread-library) -$(objpfx)tst-mallocfork2-mcheck: $(shared-thread-library) +$(objpfx)tst-malloc-tcache-leak-malloc-check: $(shared-thread-library) +$(objpfx)tst-malloc_info-malloc-check: $(shared-thread-library) +$(objpfx)tst-mallocfork2-malloc-check: $(shared-thread-library)