mirror of
https://github.com/git/git.git
synced 2024-11-18 06:54:55 +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>
31 lines
562 B
Bash
Executable file
31 lines
562 B
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
#
|
|
|
|
test_description='git apply should handle files with incomplete lines.
|
|
|
|
'
|
|
. ./test-lib.sh
|
|
|
|
# setup
|
|
|
|
(echo a; echo b) >frotz.0
|
|
(echo a; echo b; echo c) >frotz.1
|
|
(echo a; echo b | tr -d '\012') >frotz.2
|
|
(echo a; echo c; echo b | tr -d '\012') >frotz.3
|
|
|
|
for i in 0 1 2 3
|
|
do
|
|
for j in 0 1 2 3
|
|
do
|
|
test $i -eq $j && continue
|
|
cat frotz.$i >frotz
|
|
test_expect_success "apply diff between $i and $j" '
|
|
git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
|
|
test_cmp frotz.$j frotz
|
|
'
|
|
done
|
|
done
|
|
|
|
test_done
|