[PATCH] t/Makefile: update makefile to remove new spaceful trash directory

drafnel@gmail.com· May 18, 2008, 04:03 UTC · lore

From: Brandon Casey <drafnel@gmail.com>

Signed-off-by: Brandon Casey <drafnel@gmail.com>
---
 t/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to t/Makefile +1 −1

diff --git a/t/Makefile b/t/Makefile
index 72d7884..c6a60ab 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -20,7 +20,7 @@ $(T):
 	@echo "*** $@ ***"; GIT_CONFIG=.git/config '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
 
 clean:
-	$(RM) -r trash
+	$(RM) -r 'trash directory'
 
 # we can test NO_OPTIMIZE_COMMITS independently of LC_ALL
 full-svn-test:

-- 
1.5.5.1.447.geb0a7

Jeff King· May 18, 2008, 05:01 UTC · re: drafnel@gmail.com · lore

Re: [PATCH] t/Makefile: update makefile to remove new spaceful trash directory

On Sat, May 17, 2008 at 11:03:03PM -0500, drafnel@gmail.com wrote:

>  clean:
> -	$(RM) -r trash
> +	$(RM) -r 'trash directory'

Probably these non-code references should be squashed in as well. This is the result of scanning "git grep trash". There are still a few references to "trash" in test script comments, but they are more of the "this goes in the trash directory" context and not "the name of this directory is 'trash'".

t5516 has a few insteadOf tests that look like they might be problematic, but aren't.

---

Show changes to 2 files +2 −2

t/README, t/test-lib.sh

diff --git a/t/README b/t/README
index 73ed11b..70841a4 100644
--- a/t/README
+++ b/t/README
@@ -123,7 +123,7 @@ This test harness library does the following things:
    (or -h), it shows the test_description and exits.
 
  - Creates an empty test directory with an empty .git/objects
-   database and chdir(2) into it.  This directory is 't/trash'
+   database and chdir(2) into it.  This directory is 't/trash directory'
    if you must know, but I do not think you care.
 
  - Defines standard test helper functions for your scripts to
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 5002fb0..6ba569f 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -368,7 +368,7 @@ test_done () {
 	case "$test_failure" in
 	0)
 		# We could:
-		# cd .. && rm -fr trash
+		# cd .. && rm -fr 'trash directory'
 		# but that means we forbid any tests that use their own
 		# subdirectory from calling test_done without coming back
 		# to where they started from.

patcht/Makefile: update makefile to remove new spaceful trash directory