mirror of
https://github.com/git/git.git
synced 2024-10-30 05:47:53 +01:00
bfdbee9810
Many test scripts assumed that they will start in a 'trash' subdirectory
that is a single level down from the t/ directory, and referred to their
test vector files by asking for files like "../t9999/expect". This will
break if we move the 'trash' subdirectory elsewhere.
To solve this, we earlier introduced "$TEST_DIRECTORY" so that they can
refer to t/ directory reliably. This finally makes all the tests use
it to refer to the outside environment.
With this patch, and a one-liner not included here (because it would
contradict with what Dscho really wants to do):
| diff --git a/t/test-lib.sh b/t/test-lib.sh
| index 70ea7e0..60e69e4 100644
| --- a/t/test-lib.sh
| +++ b/t/test-lib.sh
| @@ -485,7 +485,7 @@ fi
| . ../GIT-BUILD-OPTIONS
|
| # Test repository
| -test="trash directory"
| +test="trash directory/another level/yet another"
| rm -fr "$test" || {
| trap - exit
| echo >&5 "FATAL: Cannot prepare test area"
all the tests still pass, but we would want extra sets of eyeballs on this
type of change to really make sure.
[jc: with help from Stephan Beyer on http-push tests I do not run myself;
credits for locating silly quoting errors go to Olivier Marin.]
Signed-off-by: Junio C Hamano <gitster@pobox.com>
33 lines
590 B
Bash
Executable file
33 lines
590 B
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='ignore CR in CRLF sequence while computing similiarity'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
|
|
cat "$TEST_DIRECTORY"/t0022-crlf-rename.sh >sample &&
|
|
git add sample &&
|
|
|
|
test_tick &&
|
|
git commit -m Initial &&
|
|
|
|
sed -e "s/\$/
|
|
/" "$TEST_DIRECTORY"/t0022-crlf-rename.sh >elpmas &&
|
|
git add elpmas &&
|
|
rm -f sample &&
|
|
|
|
test_tick &&
|
|
git commit -a -m Second
|
|
|
|
'
|
|
|
|
test_expect_success 'diff -M' '
|
|
|
|
git diff-tree -M -r --name-status HEAD^ HEAD |
|
|
sed -e "s/R[0-9]*/RNUM/" >actual &&
|
|
echo "RNUM sample elpmas" >expect &&
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
test_done
|