AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-09 23:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests-clean Makefile target (bug 30545)

Browse Source 
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:
Maxim Kuvyrkov 2023-06-15 15:25:47 +00:00 committed by Adhemerval Zanella
parent 9a17a193b4
commit 7c507f4473
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -518,7 +518,10 @@ mostlyclean: parent-mostlyclean
@$(MAKE) subdir_mostlyclean no_deps=t @$(MAKE) subdir_mostlyclean no_deps=t
-rm -f $(postclean) -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 @$(MAKE) subdir_testclean no_deps=t
ifneq (,$(CXX)) ifneq (,$(CXX))

23
Makerules
View File

@ -1334,18 +1334,13 @@ echo-headers:
clean: common-clean clean: common-clean
mostlyclean: common-mostlyclean mostlyclean: common-mostlyclean
# Remove test artifacts from a given directory
do-tests-clean: do-tests-clean:
-rm -f $(addprefix $(objpfx),$(addsuffix .out,$(tests) \ -find $(objpfx) -name '*.out' -delete
$(tests-internal) \ -find $(objpfx) -name '*.test-result' -delete
$(xtests) \
$(test-srcs)) \
$(addsuffix .test-result,$(tests) \
$(tests-internal) \
$(xtests) \
$(test-srcs)))
# Remove the object files. # Remove the object files.
common-mostlyclean: common-mostlyclean: do-tests-clean
-rm -f $(addprefix $(objpfx),$(tests) $(tests-internal) $(xtests) \ -rm -f $(addprefix $(objpfx),$(tests) $(tests-internal) $(xtests) \
$(test-srcs) \ $(test-srcs) \
$(others) $(sysdep-others) stubs \ $(others) $(sysdep-others) stubs \
@ -1354,15 +1349,7 @@ common-mostlyclean:
$(xtests) \ $(xtests) \
$(test-srcs) \ $(test-srcs) \
$(others) \ $(others) \
$(sysdep-others)) \ $(sysdep-others)))
$(addsuffix .out,$(tests) \
$(tests-internal) \
$(xtests) \
$(test-srcs)) \
$(addsuffix .test-result,$(tests) \
$(tests-internal) \
$(xtests) \
$(test-srcs)))
-rm -f $(addprefix $(objpfx),$(extra-objs) $(extra-test-objs) \ -rm -f $(addprefix $(objpfx),$(extra-objs) $(extra-test-objs) \
$(install-lib) $(install-lib.so) \ $(install-lib) $(install-lib.so) \
$(install-lib.so:%.so=%_pic.a)) $(install-lib.so:%.so=%_pic.a))