diff options
| author | Siddhesh Poyarekar <siddhesh@sourceware.org> | 2021-06-22 15:46:11 +0530 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@sourceware.org> | 2021-06-23 09:15:48 +0530 |
| commit | 451659ccf13c513611841a69327193facbfdd977 (patch) | |
| tree | 46167ce57dac6d2e2221fd63fa1b10bce7a7eae7 /Rules | |
| parent | 7b54aaf2ceaf83b97f7e8b380386962ae529bd9d (diff) | |
| download | glibc-451659ccf13c513611841a69327193facbfdd977.tar.gz glibc-451659ccf13c513611841a69327193facbfdd977.tar.xz glibc-451659ccf13c513611841a69327193facbfdd977.zip | |
More mcheck -> malloc-check refactoring
Refactored malloc-check rules for tests that are automatically generated and executed with MALLOC_CHECK_=3.
Diffstat (limited to 'Rules')
| -rw-r--r-- | Rules | 20 |
1 files changed, 10 insertions, 10 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 |