From 1931172da5b3f8a880cccb4ff8838da6bab7ced7 Mon Sep 17 00:00:00 2001 From: "Kyle J. McKay" Date: Fri, 16 Jun 2017 11:03:37 -0700 Subject: [PATCH] t/Makefile.mak: suppress superfluous messages from rm During trash directory cleanup rm may spew some unimportant messages if the permissions are overly restricted during the initial part of the clean up. They are irrelevant and distracting since if the cleanup really fails they will be emitted correctly later. Therefore suppress the bogus messages. Also take this opportunity to make sure missing read permission is also handled corretly during the cleanup and everything truly executes as intended in the presence of permission restrictions. Signed-off-by: Kyle J. McKay --- t/Makefile.mak | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/t/Makefile.mak b/t/Makefile.mak index 69cb5c3..8bb56b1 100644 --- a/t/Makefile.mak +++ b/t/Makefile.mak @@ -125,7 +125,10 @@ pre-clean: $(Q)rm -r -f '$(TEST_RESULTS_DIRECTORY_SQ)' post-clean-except-prove-cache: - rm -r -f empty 'trash directory'.* '$(TEST_RESULTS_DIRECTORY_SQ)' + rm -r -f '$(TEST_RESULTS_DIRECTORY_SQ)' + @chmod -R u+rw 'trash directory'.* >/dev/null 2>&1 || : + @chmod -R u+rw 'trash tmp directory'.* >/dev/null 2>&1 || : + rm -r -f empty 'trash directory'.* 'trash tmp directory'.* rm -f TG-TEST-CACHE post-clean: post-clean-except-prove-cache FORCE -- 2.11.4.GIT