mirror of
git://sourceware.org/git/glibc.git
synced 2025-03-06 20:58:33 +01:00
Fix tests-clean Makefile target (bug 30545)
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> Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> Reviewed-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
parent
9a17a193b4
commit
7c507f4473
2 changed files with 9 additions and 19 deletions
5
Makefile
5
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))
|
||||
|
|
23
Makerules
23
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))
|
||||
|
|
Loading…
Add table
Reference in a new issue