Skip to content

Commit 90a1d88

Browse files
dschodscho
committed
tests: move test PNGs into t/lib-diff/
We already have a directory where we store files intended for use by multiple test scripts. The same directory is a better home for the test-binary-*.png files than t/. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent 3bc06dd commit 90a1d88

10 files changed

+20
-20
lines changed

Diff for: ‎t/test-binary-1.png renamed to ‎t/lib-diff/test-binary-1.png

File renamed without changes.

Diff for: ‎t/test-binary-2.png renamed to ‎t/lib-diff/test-binary-2.png

File renamed without changes.

Diff for: ‎t/t3307-notes-man.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ test_expect_success 'example 1: notes to add an Acked-by line' '
2626
'
2727

2828
test_expect_success 'example 2: binary notes' '
29-
cp "$TEST_DIRECTORY"/test-binary-1.png . &&
29+
cp "$TEST_DIRECTORY"/lib-diff/test-binary-1.png . &&
3030
git checkout B &&
3131
blob=$(git hash-object -w test-binary-1.png) &&
3232
git notes --ref=logo add -C "$blob" &&

Diff for: ‎t/t3903-stash.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1345,7 +1345,7 @@ test_expect_success 'stash -- <subdir> works with binary files' '
13451345
git reset &&
13461346
>subdir/untracked &&
13471347
>subdir/tracked &&
1348-
cp "$TEST_DIRECTORY"/test-binary-1.png subdir/tracked-binary &&
1348+
cp "$TEST_DIRECTORY"/lib-diff/test-binary-1.png subdir/tracked-binary &&
13491349
git add subdir/tracked* &&
13501350
git stash -- subdir/ &&
13511351
test_path_is_missing subdir/tracked &&

Diff for: ‎t/t4012-diff-binary.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ test_expect_success 'prepare repository' '
1919
echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d &&
2020
git update-index --add a b c d &&
2121
echo git >a &&
22-
cat "$TEST_DIRECTORY"/test-binary-1.png >b &&
22+
cat "$TEST_DIRECTORY"/lib-diff/test-binary-1.png >b &&
2323
echo git >c &&
2424
cat b b >d
2525
'

Diff for: ‎t/t4049-diff-stat-count.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ test_expect_success 'binary changes do not count in lines' '
3333
git reset --hard &&
3434
echo a >a &&
3535
echo c >c &&
36-
cat "$TEST_DIRECTORY"/test-binary-1.png >d &&
36+
cat "$TEST_DIRECTORY"/lib-diff/test-binary-1.png >d &&
3737
cat >expect <<-\EOF &&
3838
a | 1 +
3939
c | 1 +

Diff for: ‎t/t4108-apply-threeway.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -272,11 +272,11 @@ test_expect_success 'apply with --3way --cached and conflicts' '
272272

273273
test_expect_success 'apply binary file patch' '
274274
git reset --hard main &&
275-
cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
275+
cp "$TEST_DIRECTORY/lib-diff/test-binary-1.png" bin.png &&
276276
git add bin.png &&
277277
git commit -m "add binary file" &&
278278
279-
cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
279+
cp "$TEST_DIRECTORY/lib-diff/test-binary-2.png" bin.png &&
280280
281281
git diff --binary >bin.diff &&
282282
git reset --hard &&
@@ -287,11 +287,11 @@ test_expect_success 'apply binary file patch' '
287287

288288
test_expect_success 'apply binary file patch with 3way' '
289289
git reset --hard main &&
290-
cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
290+
cp "$TEST_DIRECTORY/lib-diff/test-binary-1.png" bin.png &&
291291
git add bin.png &&
292292
git commit -m "add binary file" &&
293293
294-
cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
294+
cp "$TEST_DIRECTORY/lib-diff/test-binary-2.png" bin.png &&
295295
296296
git diff --binary >bin.diff &&
297297
git reset --hard &&
@@ -302,11 +302,11 @@ test_expect_success 'apply binary file patch with 3way' '
302302

303303
test_expect_success 'apply full-index patch with 3way' '
304304
git reset --hard main &&
305-
cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
305+
cp "$TEST_DIRECTORY/lib-diff/test-binary-1.png" bin.png &&
306306
git add bin.png &&
307307
git commit -m "add binary file" &&
308308
309-
cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
309+
cp "$TEST_DIRECTORY/lib-diff/test-binary-2.png" bin.png &&
310310
311311
git diff --full-index >bin.diff &&
312312
git reset --hard &&

Diff for: ‎t/t6403-merge-file.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -355,12 +355,12 @@ test_expect_success "expected conflict markers" '
355355

356356
test_expect_success 'binary files cannot be merged' '
357357
test_must_fail git merge-file -p \
358-
orig.txt "$TEST_DIRECTORY"/test-binary-1.png new1.txt 2> merge.err &&
358+
orig.txt "$TEST_DIRECTORY"/lib-diff/test-binary-1.png new1.txt 2> merge.err &&
359359
grep "Cannot merge binary files" merge.err
360360
'
361361

362362
test_expect_success 'binary files cannot be merged with --object-id' '
363-
cp "$TEST_DIRECTORY"/test-binary-1.png . &&
363+
cp "$TEST_DIRECTORY"/lib-diff/test-binary-1.png . &&
364364
git add orig.txt new1.txt test-binary-1.png &&
365365
test_must_fail git merge-file --object-id \
366366
:orig.txt :test-binary-1.png :new1.txt 2> merge.err &&

Diff for: ‎t/t6407-merge-binary.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
99

1010
test_expect_success setup '
1111
12-
cat "$TEST_DIRECTORY"/test-binary-1.png >m &&
12+
cat "$TEST_DIRECTORY"/lib-diff/test-binary-1.png >m &&
1313
git add m &&
1414
git ls-files -s | sed -e "s/ 0 / 1 /" >E1 &&
1515
test_tick &&

Diff for: ‎t/t9200-git-cvsexportcommit.sh

+7-7
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ test_expect_success 'New file' '
5454
mkdir A B C D E F &&
5555
echo hello1 >A/newfile1.txt &&
5656
echo hello2 >B/newfile2.txt &&
57-
cp "$TEST_DIRECTORY"/test-binary-1.png C/newfile3.png &&
58-
cp "$TEST_DIRECTORY"/test-binary-1.png D/newfile4.png &&
57+
cp "$TEST_DIRECTORY"/lib-diff/test-binary-1.png C/newfile3.png &&
58+
cp "$TEST_DIRECTORY"/lib-diff/test-binary-1.png D/newfile4.png &&
5959
git add A/newfile1.txt &&
6060
git add B/newfile2.txt &&
6161
git add C/newfile3.png &&
@@ -80,8 +80,8 @@ test_expect_success 'Remove two files, add two and update two' '
8080
rm -f B/newfile2.txt &&
8181
rm -f C/newfile3.png &&
8282
echo Hello5 >E/newfile5.txt &&
83-
cp "$TEST_DIRECTORY"/test-binary-2.png D/newfile4.png &&
84-
cp "$TEST_DIRECTORY"/test-binary-1.png F/newfile6.png &&
83+
cp "$TEST_DIRECTORY"/lib-diff/test-binary-2.png D/newfile4.png &&
84+
cp "$TEST_DIRECTORY"/lib-diff/test-binary-1.png F/newfile6.png &&
8585
git add E/newfile5.txt &&
8686
git add F/newfile6.png &&
8787
git commit -a -m "Test: Remove, add and update" &&
@@ -169,7 +169,7 @@ test_expect_success 'New file with spaces in file name' '
169169
mkdir "G g" &&
170170
echo ok then >"G g/with spaces.txt" &&
171171
git add "G g/with spaces.txt" && \
172-
cp "$TEST_DIRECTORY"/test-binary-1.png "G g/with spaces.png" && \
172+
cp "$TEST_DIRECTORY"/lib-diff/test-binary-1.png "G g/with spaces.png" && \
173173
git add "G g/with spaces.png" &&
174174
git commit -a -m "With spaces" &&
175175
id=$(git rev-list --max-count=1 HEAD) &&
@@ -181,7 +181,7 @@ test_expect_success 'New file with spaces in file name' '
181181

182182
test_expect_success 'Update file with spaces in file name' '
183183
echo Ok then >>"G g/with spaces.txt" &&
184-
cat "$TEST_DIRECTORY"/test-binary-1.png >>"G g/with spaces.png" && \
184+
cat "$TEST_DIRECTORY"/lib-diff/test-binary-1.png >>"G g/with spaces.png" && \
185185
git add "G g/with spaces.png" &&
186186
git commit -a -m "Update with spaces" &&
187187
id=$(git rev-list --max-count=1 HEAD) &&
@@ -206,7 +206,7 @@ test_expect_success !MINGW 'File with non-ascii file name' '
206206
mkdir -p Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö &&
207207
echo Foo >Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt &&
208208
git add Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt &&
209-
cp "$TEST_DIRECTORY"/test-binary-1.png Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png &&
209+
cp "$TEST_DIRECTORY"/lib-diff/test-binary-1.png Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png &&
210210
git add Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png &&
211211
git commit -a -m "Går det så går det" && \
212212
id=$(git rev-list --max-count=1 HEAD) &&

0 commit comments

Comments
 (0)