Skip to content

Commit 969d646

Browse files
dschomjcheetham
dscho
authored and
mjcheetham
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 <[email protected]>
1 parent 97d7251 commit 969d646

10 files changed

+20
-20
lines changed

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

File renamed without changes.

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

File renamed without changes.

‎t/t3307-notes-man.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ test_expect_success 'example 1: notes to add an Acked-by line' '
2727
'
2828

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

‎t/t3903-stash.sh

Lines changed: 1 addition & 1 deletion
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 &&

‎t/t4012-diff-binary.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ test_expect_success 'prepare repository' '
2020
echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d &&
2121
git update-index --add a b c d &&
2222
echo git >a &&
23-
cat "$TEST_DIRECTORY"/test-binary-1.png >b &&
23+
cat "$TEST_DIRECTORY"/lib-diff/test-binary-1.png >b &&
2424
echo git >c &&
2525
cat b b >d
2626
'

‎t/t4049-diff-stat-count.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ test_expect_success 'binary changes do not count in lines' '
3434
git reset --hard &&
3535
echo a >a &&
3636
echo c >c &&
37-
cat "$TEST_DIRECTORY"/test-binary-1.png >d &&
37+
cat "$TEST_DIRECTORY"/lib-diff/test-binary-1.png >d &&
3838
cat >expect <<-\EOF &&
3939
a | 1 +
4040
c | 1 +

‎t/t4108-apply-threeway.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -232,11 +232,11 @@ test_expect_success 'apply with --3way --cached and conflicts' '
232232

233233
test_expect_success 'apply binary file patch' '
234234
git reset --hard main &&
235-
cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
235+
cp "$TEST_DIRECTORY/lib-diff/test-binary-1.png" bin.png &&
236236
git add bin.png &&
237237
git commit -m "add binary file" &&
238238
239-
cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
239+
cp "$TEST_DIRECTORY/lib-diff/test-binary-2.png" bin.png &&
240240
241241
git diff --binary >bin.diff &&
242242
git reset --hard &&
@@ -247,11 +247,11 @@ test_expect_success 'apply binary file patch' '
247247

248248
test_expect_success 'apply binary file patch with 3way' '
249249
git reset --hard main &&
250-
cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
250+
cp "$TEST_DIRECTORY/lib-diff/test-binary-1.png" bin.png &&
251251
git add bin.png &&
252252
git commit -m "add binary file" &&
253253
254-
cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
254+
cp "$TEST_DIRECTORY/lib-diff/test-binary-2.png" bin.png &&
255255
256256
git diff --binary >bin.diff &&
257257
git reset --hard &&
@@ -262,11 +262,11 @@ test_expect_success 'apply binary file patch with 3way' '
262262

263263
test_expect_success 'apply full-index patch with 3way' '
264264
git reset --hard main &&
265-
cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
265+
cp "$TEST_DIRECTORY/lib-diff/test-binary-1.png" bin.png &&
266266
git add bin.png &&
267267
git commit -m "add binary file" &&
268268
269-
cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
269+
cp "$TEST_DIRECTORY/lib-diff/test-binary-2.png" bin.png &&
270270
271271
git diff --full-index >bin.diff &&
272272
git reset --hard &&

‎t/t6403-merge-file.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,12 +356,12 @@ test_expect_success "expected conflict markers" '
356356

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

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

‎t/t6407-merge-binary.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ TEST_PASSES_SANITIZE_LEAK=true
1010

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

‎t/t9200-git-cvsexportcommit.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ test_expect_success 'New file' '
5555
mkdir A B C D E F &&
5656
echo hello1 >A/newfile1.txt &&
5757
echo hello2 >B/newfile2.txt &&
58-
cp "$TEST_DIRECTORY"/test-binary-1.png C/newfile3.png &&
59-
cp "$TEST_DIRECTORY"/test-binary-1.png D/newfile4.png &&
58+
cp "$TEST_DIRECTORY"/lib-diff/test-binary-1.png C/newfile3.png &&
59+
cp "$TEST_DIRECTORY"/lib-diff/test-binary-1.png D/newfile4.png &&
6060
git add A/newfile1.txt &&
6161
git add B/newfile2.txt &&
6262
git add C/newfile3.png &&
@@ -81,8 +81,8 @@ test_expect_success 'Remove two files, add two and update two' '
8181
rm -f B/newfile2.txt &&
8282
rm -f C/newfile3.png &&
8383
echo Hello5 >E/newfile5.txt &&
84-
cp "$TEST_DIRECTORY"/test-binary-2.png D/newfile4.png &&
85-
cp "$TEST_DIRECTORY"/test-binary-1.png F/newfile6.png &&
84+
cp "$TEST_DIRECTORY"/lib-diff/test-binary-2.png D/newfile4.png &&
85+
cp "$TEST_DIRECTORY"/lib-diff/test-binary-1.png F/newfile6.png &&
8686
git add E/newfile5.txt &&
8787
git add F/newfile6.png &&
8888
git commit -a -m "Test: Remove, add and update" &&
@@ -170,7 +170,7 @@ test_expect_success 'New file with spaces in file name' '
170170
mkdir "G g" &&
171171
echo ok then >"G g/with spaces.txt" &&
172172
git add "G g/with spaces.txt" && \
173-
cp "$TEST_DIRECTORY"/test-binary-1.png "G g/with spaces.png" && \
173+
cp "$TEST_DIRECTORY"/lib-diff/test-binary-1.png "G g/with spaces.png" && \
174174
git add "G g/with spaces.png" &&
175175
git commit -a -m "With spaces" &&
176176
id=$(git rev-list --max-count=1 HEAD) &&
@@ -182,7 +182,7 @@ test_expect_success 'New file with spaces in file name' '
182182

183183
test_expect_success 'Update file with spaces in file name' '
184184
echo Ok then >>"G g/with spaces.txt" &&
185-
cat "$TEST_DIRECTORY"/test-binary-1.png >>"G g/with spaces.png" && \
185+
cat "$TEST_DIRECTORY"/lib-diff/test-binary-1.png >>"G g/with spaces.png" && \
186186
git add "G g/with spaces.png" &&
187187
git commit -a -m "Update with spaces" &&
188188
id=$(git rev-list --max-count=1 HEAD) &&
@@ -207,7 +207,7 @@ test_expect_success !MINGW 'File with non-ascii file name' '
207207
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/å/ä/ö &&
208208
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 &&
209209
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 &&
210-
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 &&
210+
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 &&
211211
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 &&
212212
git commit -a -m "Går det så går det" && \
213213
id=$(git rev-list --max-count=1 HEAD) &&

0 commit comments

Comments
 (0)