diff options
| author |  Brandon Casey <drafnel@gmail.com> | 2008-05-17 23:03:03 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-05-18 21:39:58 -0700 |
| commit | 9231e3a953c0780846dacdcf3928f6658fa4fad0 (patch) | |
| tree | 7ad91e22f15e6f1c83f1f4b04fa5e89016fab668 | |
| parent | Ensure that a test is run in the trash directory (diff) | |
| download | tgif-9231e3a953c0780846dacdcf3928f6658fa4fad0.tar.xz | |
t/Makefile: "trash" directory was renamed recently
Signed-off-by: Brandon Casey <drafnel@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | t/Makefile | 2 | ||||
| -rw-r--r-- | t/README | 2 | ||||
| -rw-r--r-- | t/test-lib.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/t/Makefile b/t/Makefile index 72d7884232..c6a60ab165 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: @@ -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 d1018c99c6..3bf570b068 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. |