From: Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org>
To: libc-alpha@sourceware.org
Cc: Carlos O'Donell <carlos@redhat.com>,
Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org>
Subject: [PATCH] Fix tests-clean Makefile target (bug 30545)
Date: Thu, 15 Jun 2023 15:25:47 +0000 [thread overview]
Message-ID: <20230615152547.2924770-1-maxim.kuvyrkov@linaro.org> (raw)
This patch improves tests-clean Makefile target to reliably clean
test artifacts from a build directory. Before this patch tests-clean
missed around 3k (out of total 9k) .out and .test-result files.
Signed-off-by: Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org>
---
Makefile | 5 ++++-
Makerules | 23 +++++------------------
2 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/Makefile b/Makefile
index 523efd42c1..f324df7a1f 100644
--- a/Makefile
+++ b/Makefile
@@ -518,7 +518,10 @@ mostlyclean: parent-mostlyclean
@$(MAKE) subdir_mostlyclean no_deps=t
-rm -f $(postclean)
-tests-clean:
+# Remove test artifacts from the whole glibc build.
+# do-tests-clean removes test artifacts from top-level directory, and
+# subdir_testclean removes them from individual sub-directories.
+tests-clean: do-tests-clean
@$(MAKE) subdir_testclean no_deps=t
ifneq (,$(CXX))
diff --git a/Makerules b/Makerules
index 2ccf26d320..018780c818 100644
--- a/Makerules
+++ b/Makerules
@@ -1334,18 +1334,13 @@ echo-headers:
clean: common-clean
mostlyclean: common-mostlyclean
+# Remove test artifacts from a given directory
do-tests-clean:
- -rm -f $(addprefix $(objpfx),$(addsuffix .out,$(tests) \
- $(tests-internal) \
- $(xtests) \
- $(test-srcs)) \
- $(addsuffix .test-result,$(tests) \
- $(tests-internal) \
- $(xtests) \
- $(test-srcs)))
+ -find $(objpfx) -name '*.out' -delete
+ -find $(objpfx) -name '*.test-result' -delete
# Remove the object files.
-common-mostlyclean:
+common-mostlyclean: do-tests-clean
-rm -f $(addprefix $(objpfx),$(tests) $(tests-internal) $(xtests) \
$(test-srcs) \
$(others) $(sysdep-others) stubs \
@@ -1354,15 +1349,7 @@ common-mostlyclean:
$(xtests) \
$(test-srcs) \
$(others) \
- $(sysdep-others)) \
- $(addsuffix .out,$(tests) \
- $(tests-internal) \
- $(xtests) \
- $(test-srcs)) \
- $(addsuffix .test-result,$(tests) \
- $(tests-internal) \
- $(xtests) \
- $(test-srcs)))
+ $(sysdep-others)))
-rm -f $(addprefix $(objpfx),$(extra-objs) $(extra-test-objs) \
$(install-lib) $(install-lib.so) \
$(install-lib.so:%.so=%_pic.a))
--
2.34.1
next reply other threads:[~2023-06-15 15:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-15 15:25 Maxim Kuvyrkov [this message]
2023-06-21 12:54 ` Adhemerval Zanella Netto
2023-06-26 13:02 ` Carlos O'Donell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230615152547.2924770-1-maxim.kuvyrkov@linaro.org \
--to=maxim.kuvyrkov@linaro.org \
--cc=carlos@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).