mirror of
https://github.com/git/git
synced 2024-10-30 04:01:21 +00: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>
62 lines
1 KiB
Bash
Executable file
62 lines
1 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
#
|
|
|
|
test_description='Test built-in diff output engine.
|
|
|
|
'
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/diff-lib.sh
|
|
|
|
echo >path0 'Line 1
|
|
Line 2
|
|
line 3'
|
|
cat path0 >path1
|
|
chmod +x path1
|
|
|
|
test_expect_success \
|
|
'update-index --add two files with and without +x.' \
|
|
'git update-index --add path0 path1'
|
|
|
|
mv path0 path0-
|
|
sed -e 's/line/Line/' <path0- >path0
|
|
chmod +x path0
|
|
rm -f path1
|
|
test_expect_success \
|
|
'git diff-files -p after editing work tree.' \
|
|
'git diff-files -p >current'
|
|
|
|
# that's as far as it comes
|
|
if [ "$(git config --get core.filemode)" = false ]
|
|
then
|
|
say 'filemode disabled on the filesystem'
|
|
test_done
|
|
fi
|
|
|
|
cat >expected <<\EOF
|
|
diff --git a/path0 b/path0
|
|
old mode 100644
|
|
new mode 100755
|
|
--- a/path0
|
|
+++ b/path0
|
|
@@ -1,3 +1,3 @@
|
|
Line 1
|
|
Line 2
|
|
-line 3
|
|
+Line 3
|
|
diff --git a/path1 b/path1
|
|
deleted file mode 100755
|
|
--- a/path1
|
|
+++ /dev/null
|
|
@@ -1,3 +0,0 @@
|
|
-Line 1
|
|
-Line 2
|
|
-line 3
|
|
EOF
|
|
|
|
test_expect_success \
|
|
'validate git diff-files -p output.' \
|
|
'compare_diff_patch current expected'
|
|
|
|
test_done
|