Skip to content

Commit 4ac7da7

Browse files
dschodscho
committed
tests: use t/lib-diff/* consistently
The idea of copying README and COPYING into t/lib-diff/ was to step away from using files from outside t/ in tests. Let's really make sure that we use the files from t/lib-diff/ instead of other versions of those files. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 2c6f08f commit 4ac7da7

5 files changed

Lines changed: 17 additions & 17 deletions

File tree

‎t/t4022-diff-rewrite.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ test_description='rewrite diff'
66

77
test_expect_success setup '
88
9-
cat "$TEST_DIRECTORY"/../COPYING >test &&
9+
cat "$TEST_DIRECTORY"/lib-diff/COPYING >test &&
1010
git add test &&
1111
tr \
1212
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" \
1313
"nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM" \
14-
<"$TEST_DIRECTORY"/../COPYING >test &&
14+
<"$TEST_DIRECTORY"/lib-diff/COPYING >test &&
1515
echo "to be deleted" >test2 &&
1616
blob=$(git hash-object test2) &&
1717
blob=$(git rev-parse --short $blob) &&

‎t/t4023-diff-rename-typechange.sh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@ test_description='typechange rename detection'
77
test_expect_success setup '
88
99
rm -f foo bar &&
10-
cat "$TEST_DIRECTORY"/../COPYING >foo &&
10+
cat "$TEST_DIRECTORY"/lib-diff/COPYING >foo &&
1111
test_ln_s_add linklink bar &&
1212
git add foo &&
1313
git commit -a -m Initial &&
1414
git tag one &&
1515
1616
git rm -f foo bar &&
17-
cat "$TEST_DIRECTORY"/../COPYING >bar &&
17+
cat "$TEST_DIRECTORY"/lib-diff/COPYING >bar &&
1818
test_ln_s_add linklink foo &&
1919
git add bar &&
2020
git commit -a -m Second &&
2121
git tag two &&
2222
2323
git rm -f foo bar &&
24-
cat "$TEST_DIRECTORY"/../COPYING >foo &&
24+
cat "$TEST_DIRECTORY"/lib-diff/COPYING >foo &&
2525
git add foo &&
2626
git commit -a -m Third &&
2727
git tag three &&
@@ -35,15 +35,15 @@ test_expect_success setup '
3535
# This is purely for sanity check
3636
3737
git rm -f foo bar &&
38-
cat "$TEST_DIRECTORY"/../COPYING >foo &&
39-
cat "$TEST_DIRECTORY"/../Makefile >bar &&
38+
cat "$TEST_DIRECTORY"/lib-diff/COPYING >foo &&
39+
cat "$TEST_DIRECTORY"/lib-diff/README >bar &&
4040
git add foo bar &&
4141
git commit -a -m Fifth &&
4242
git tag five &&
4343
4444
git rm -f foo bar &&
45-
cat "$TEST_DIRECTORY"/../Makefile >foo &&
46-
cat "$TEST_DIRECTORY"/../COPYING >bar &&
45+
cat "$TEST_DIRECTORY"/lib-diff/README >foo &&
46+
cat "$TEST_DIRECTORY"/lib-diff/COPYING >bar &&
4747
git add foo bar &&
4848
git commit -a -m Sixth &&
4949
git tag six

‎t/t7001-mv.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ test_description='git mv in subdirs'
55

66
test_expect_success 'prepare reference tree' '
77
mkdir path0 path1 &&
8-
cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
8+
cp "$TEST_DIRECTORY"/lib-diff/COPYING path0/COPYING &&
99
git add path0/COPYING &&
1010
git commit -m add -a
1111
'
@@ -107,7 +107,7 @@ test_expect_success 'clean up' '
107107
'
108108

109109
test_expect_success 'adding another file' '
110-
cp "$TEST_DIRECTORY"/../README.md path0/README &&
110+
cp "$TEST_DIRECTORY"/lib-diff/README path0/ &&
111111
git add path0/README &&
112112
git commit -m add2 -a
113113
'

‎t/t7060-wtstatus.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ EOF
6464

6565
test_expect_success 'rename & unmerged setup' '
6666
git rm -f -r . &&
67-
cat "$TEST_DIRECTORY/README" >ONE &&
67+
cat "$TEST_DIRECTORY/lib-diff/README" >ONE &&
6868
git add ONE &&
6969
test_tick &&
7070
git commit -m "One commit with ONE" &&

‎t/t7101-reset-empty-subdirs.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ test_description='git reset should cull empty subdirs'
88

99
test_expect_success 'creating initial files' '
1010
mkdir path0 &&
11-
cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
11+
cp "$TEST_DIRECTORY"/lib-diff/COPYING path0/COPYING &&
1212
git add path0/COPYING &&
1313
git commit -m add -a
1414
'
1515

1616
test_expect_success 'creating second files' '
1717
mkdir path1 &&
1818
mkdir path1/path2 &&
19-
cp "$TEST_DIRECTORY"/../COPYING path1/path2/COPYING &&
20-
cp "$TEST_DIRECTORY"/../COPYING path1/COPYING &&
21-
cp "$TEST_DIRECTORY"/../COPYING COPYING &&
22-
cp "$TEST_DIRECTORY"/../COPYING path0/COPYING-TOO &&
19+
cp "$TEST_DIRECTORY"/lib-diff/COPYING path1/path2/COPYING &&
20+
cp "$TEST_DIRECTORY"/lib-diff/COPYING path1/COPYING &&
21+
cp "$TEST_DIRECTORY"/lib-diff/COPYING COPYING &&
22+
cp "$TEST_DIRECTORY"/lib-diff/COPYING path0/COPYING-TOO &&
2323
git add path1/path2/COPYING &&
2424
git add path1/COPYING &&
2525
git add COPYING &&

0 commit comments

Comments
 (0)