Skip to content

Commit 0cdabc1

Browse files
newrengitster
newren
authored and
gitster
committed
t6036, t6042: use test_line_count instead of wc -l
Signed-off-by: Elijah Newren <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 2a4c19e commit 0cdabc1

File tree

2 files changed

+134
-67
lines changed

2 files changed

+134
-67
lines changed

‎t/t6036-recursive-corner-cases.sh

Lines changed: 68 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,12 @@ test_expect_success 'merge simple rename+criss-cross with no modifications' '
6565
6666
test_must_fail git merge -s recursive R2^0 &&
6767
68-
test 2 = $(git ls-files -s | wc -l) &&
69-
test 2 = $(git ls-files -u | wc -l) &&
70-
test 2 = $(git ls-files -o | wc -l) &&
68+
git ls-files -s >out &&
69+
test_line_count = 2 out &&
70+
git ls-files -u >out &&
71+
test_line_count = 2 out &&
72+
git ls-files -o >out &&
73+
test_line_count = 3 out &&
7174
7275
test $(git rev-parse :2:three) = $(git rev-parse L2:three) &&
7376
test $(git rev-parse :3:three) = $(git rev-parse R2:three) &&
@@ -135,9 +138,12 @@ test_expect_success 'merge criss-cross + rename merges with basic modification'
135138
136139
test_must_fail git merge -s recursive R2^0 &&
137140
138-
test 2 = $(git ls-files -s | wc -l) &&
139-
test 2 = $(git ls-files -u | wc -l) &&
140-
test 2 = $(git ls-files -o | wc -l) &&
141+
git ls-files -s >out &&
142+
test_line_count = 2 out &&
143+
git ls-files -u >out &&
144+
test_line_count = 2 out &&
145+
git ls-files -o >out &&
146+
test_line_count = 3 out &&
141147
142148
test $(git rev-parse :2:three) = $(git rev-parse L2:three) &&
143149
test $(git rev-parse :3:three) = $(git rev-parse R2:three) &&
@@ -211,9 +217,12 @@ test_expect_success 'git detects differently handled merges conflict' '
211217
212218
test_must_fail git merge -s recursive E^0 &&
213219
214-
test 3 = $(git ls-files -s | wc -l) &&
215-
test 3 = $(git ls-files -u | wc -l) &&
216-
test 0 = $(git ls-files -o | wc -l) &&
220+
git ls-files -s >out &&
221+
test_line_count = 3 out &&
222+
git ls-files -u >out &&
223+
test_line_count = 3 out &&
224+
git ls-files -o >out &&
225+
test_line_count = 1 out &&
217226
218227
test $(git rev-parse :2:new_a) = $(git rev-parse D:new_a) &&
219228
test $(git rev-parse :3:new_a) = $(git rev-parse E:new_a) &&
@@ -297,8 +306,10 @@ test_expect_success 'git detects conflict merging criss-cross+modify/delete' '
297306
298307
test_must_fail git merge -s recursive E^0 &&
299308
300-
test 2 -eq $(git ls-files -s | wc -l) &&
301-
test 2 -eq $(git ls-files -u | wc -l) &&
309+
git ls-files -s >out &&
310+
test_line_count = 2 out &&
311+
git ls-files -u >out &&
312+
test_line_count = 2 out &&
302313
303314
test $(git rev-parse :1:file) = $(git rev-parse master:file) &&
304315
test $(git rev-parse :2:file) = $(git rev-parse B:file)
@@ -314,8 +325,10 @@ test_expect_success 'git detects conflict merging criss-cross+modify/delete, rev
314325
315326
test_must_fail git merge -s recursive D^0 &&
316327
317-
test 2 -eq $(git ls-files -s | wc -l) &&
318-
test 2 -eq $(git ls-files -u | wc -l) &&
328+
git ls-files -s >out &&
329+
test_line_count = 2 out &&
330+
git ls-files -u >out &&
331+
test_line_count = 2 out &&
319332
320333
test $(git rev-parse :1:file) = $(git rev-parse master:file) &&
321334
test $(git rev-parse :3:file) = $(git rev-parse B:file)
@@ -423,9 +436,12 @@ test_expect_success 'merge of D & E1 fails but has appropriate contents' '
423436
424437
test_must_fail git merge -s recursive E1^0 &&
425438
426-
test 2 -eq $(git ls-files -s | wc -l) &&
427-
test 1 -eq $(git ls-files -u | wc -l) &&
428-
test 0 -eq $(git ls-files -o | wc -l) &&
439+
git ls-files -s >out &&
440+
test_line_count = 2 out &&
441+
git ls-files -u >out &&
442+
test_line_count = 1 out &&
443+
git ls-files -o >out &&
444+
test_line_count = 1 out &&
429445
430446
test $(git rev-parse :0:ignore-me) = $(git rev-parse A:ignore-me) &&
431447
test $(git rev-parse :2:a) = $(git rev-parse B:a)
@@ -440,9 +456,12 @@ test_expect_success 'merge of E1 & D fails but has appropriate contents' '
440456
441457
test_must_fail git merge -s recursive D^0 &&
442458
443-
test 2 -eq $(git ls-files -s | wc -l) &&
444-
test 1 -eq $(git ls-files -u | wc -l) &&
445-
test 0 -eq $(git ls-files -o | wc -l) &&
459+
git ls-files -s >out &&
460+
test_line_count = 2 out &&
461+
git ls-files -u >out &&
462+
test_line_count = 1 out &&
463+
git ls-files -o >out &&
464+
test_line_count = 1 out &&
446465
447466
test $(git rev-parse :0:ignore-me) = $(git rev-parse A:ignore-me) &&
448467
test $(git rev-parse :3:a) = $(git rev-parse B:a)
@@ -457,9 +476,12 @@ test_expect_success 'merge of D & E2 fails but has appropriate contents' '
457476
458477
test_must_fail git merge -s recursive E2^0 &&
459478
460-
test 4 -eq $(git ls-files -s | wc -l) &&
461-
test 3 -eq $(git ls-files -u | wc -l) &&
462-
test 1 -eq $(git ls-files -o | wc -l) &&
479+
git ls-files -s >out &&
480+
test_line_count = 4 out &&
481+
git ls-files -u >out &&
482+
test_line_count = 3 out &&
483+
git ls-files -o >out &&
484+
test_line_count = 2 out &&
463485
464486
test $(git rev-parse :2:a) = $(git rev-parse B:a) &&
465487
test $(git rev-parse :3:a/file) = $(git rev-parse E2:a/file) &&
@@ -478,9 +500,12 @@ test_expect_success 'merge of E2 & D fails but has appropriate contents' '
478500
479501
test_must_fail git merge -s recursive D^0 &&
480502
481-
test 4 -eq $(git ls-files -s | wc -l) &&
482-
test 3 -eq $(git ls-files -u | wc -l) &&
483-
test 1 -eq $(git ls-files -o | wc -l) &&
503+
git ls-files -s >out &&
504+
test_line_count = 4 out &&
505+
git ls-files -u >out &&
506+
test_line_count = 3 out &&
507+
git ls-files -o >out &&
508+
test_line_count = 2 out &&
484509
485510
test $(git rev-parse :3:a) = $(git rev-parse B:a) &&
486511
test $(git rev-parse :2:a/file) = $(git rev-parse E2:a/file) &&
@@ -574,9 +599,12 @@ test_expect_success 'handle rename/rename(1to2)/modify followed by what looks li
574599
575600
git merge -s recursive E^0 &&
576601
577-
test 1 -eq $(git ls-files -s | wc -l) &&
578-
test 0 -eq $(git ls-files -u | wc -l) &&
579-
test 0 -eq $(git ls-files -o | wc -l) &&
602+
git ls-files -s >out &&
603+
test_line_count = 1 out &&
604+
git ls-files -u >out &&
605+
test_line_count = 0 out &&
606+
git ls-files -o >out &&
607+
test_line_count = 1 out &&
580608
581609
test $(git rev-parse HEAD:newname) = $(git rev-parse E:newname)
582610
)
@@ -653,9 +681,12 @@ test_expect_failure 'detect rename/rename/add-source for virtual merge-base' '
653681
654682
git merge -s recursive E^0 &&
655683
656-
test 3 -eq $(git ls-files -s | wc -l) &&
657-
test 0 -eq $(git ls-files -u | wc -l) &&
658-
test 0 -eq $(git ls-files -o | wc -l) &&
684+
git ls-files -s >out &&
685+
test_line_count = 3 out &&
686+
git ls-files -u >out &&
687+
test_line_count = 0 out &&
688+
git ls-files -o >out &&
689+
test_line_count = 1 out &&
659690
660691
test $(git rev-parse HEAD:b) = $(git rev-parse A:a) &&
661692
test $(git rev-parse HEAD:c) = $(git rev-parse A:a) &&
@@ -727,9 +758,12 @@ test_expect_success 'virtual merge base handles rename/rename(1to2)/add-dest' '
727758
728759
git merge -s recursive E^0 &&
729760
730-
test 2 -eq $(git ls-files -s | wc -l) &&
731-
test 0 -eq $(git ls-files -u | wc -l) &&
732-
test 0 -eq $(git ls-files -o | wc -l) &&
761+
git ls-files -s >out &&
762+
test_line_count = 2 out &&
763+
git ls-files -u >out &&
764+
test_line_count = 0 out &&
765+
git ls-files -o >out &&
766+
test_line_count = 1 out &&
733767
734768
test $(git rev-parse HEAD:a) = $(git rev-parse A:a) &&
735769
test $(git rev-parse HEAD:c) = $(git rev-parse E:c)

‎t/t6042-merge-rename-corner-cases.sh

Lines changed: 66 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,12 @@ test_expect_failure 'conflict caused if rename not detected' '
116116
git checkout -q C^0 &&
117117
git merge -s recursive B^0 &&
118118
119-
test 3 -eq $(git ls-files -s | wc -l) &&
120-
test 0 -eq $(git ls-files -u | wc -l) &&
121-
test 0 -eq $(git ls-files -o | wc -l) &&
119+
git ls-files -s >out &&
120+
test_line_count = 3 out &&
121+
git ls-files -u >out &&
122+
test_line_count = 0 out &&
123+
git ls-files -o >out &&
124+
test_line_count = 1 out &&
122125
123126
test_line_count = 6 c &&
124127
test $(git rev-parse HEAD:a) = $(git rev-parse B:a) &&
@@ -203,9 +206,12 @@ test_expect_failure 'detect rename/add-source and preserve all data' '
203206
204207
git merge -s recursive C^0 &&
205208
206-
test 2 -eq $(git ls-files -s | wc -l) &&
207-
test 2 -eq $(git ls-files -u | wc -l) &&
208-
test 0 -eq $(git ls-files -o | wc -l) &&
209+
git ls-files -s >out &&
210+
test_line_count = 2 out &&
211+
git ls-files -u >out &&
212+
test_line_count = 2 out &&
213+
git ls-files -o >out &&
214+
test_line_count = 1 out &&
209215
210216
test -f a &&
211217
test -f b &&
@@ -223,9 +229,12 @@ test_expect_failure 'detect rename/add-source and preserve all data, merge other
223229
224230
git merge -s recursive B^0 &&
225231
226-
test 2 -eq $(git ls-files -s | wc -l) &&
227-
test 2 -eq $(git ls-files -u | wc -l) &&
228-
test 0 -eq $(git ls-files -o | wc -l) &&
232+
git ls-files -s >out &&
233+
test_line_count = 2 out &&
234+
git ls-files -u >out &&
235+
test_line_count = 2 out &&
236+
git ls-files -o >out &&
237+
test_line_count = 1 out &&
229238
230239
test -f a &&
231240
test -f b &&
@@ -279,9 +288,12 @@ test_expect_success 'rename/directory conflict + clean content merge' '
279288
280289
test_must_fail git merge -s recursive right^0 &&
281290
282-
test 2 -eq $(git ls-files -s | wc -l) &&
283-
test 1 -eq $(git ls-files -u | wc -l) &&
284-
test 1 -eq $(git ls-files -o | wc -l) &&
291+
git ls-files -s >out &&
292+
test_line_count = 2 out &&
293+
git ls-files -u >out &&
294+
test_line_count = 1 out &&
295+
git ls-files -o >out &&
296+
test_line_count = 2 out &&
285297
286298
echo 0 >expect &&
287299
git cat-file -p base:file >>expect &&
@@ -307,9 +319,12 @@ test_expect_success 'rename/directory conflict + content merge conflict' '
307319
308320
test_must_fail git merge -s recursive right^0 &&
309321
310-
test 4 -eq $(git ls-files -s | wc -l) &&
311-
test 3 -eq $(git ls-files -u | wc -l) &&
312-
test 1 -eq $(git ls-files -o | wc -l) &&
322+
git ls-files -s >out &&
323+
test_line_count = 4 out &&
324+
git ls-files -u >out &&
325+
test_line_count = 3 out &&
326+
git ls-files -o >out &&
327+
test_line_count = 2 out &&
313328
314329
git cat-file -p left-conflict:newfile >left &&
315330
git cat-file -p base:file >base &&
@@ -367,9 +382,12 @@ test_expect_success 'disappearing dir in rename/directory conflict handled' '
367382
368383
git merge -s recursive right^0 &&
369384
370-
test 1 -eq $(git ls-files -s | wc -l) &&
371-
test 0 -eq $(git ls-files -u | wc -l) &&
372-
test 0 -eq $(git ls-files -o | wc -l) &&
385+
git ls-files -s >out &&
386+
test_line_count = 1 out &&
387+
git ls-files -u >out &&
388+
test_line_count = 0 out &&
389+
git ls-files -o >out &&
390+
test_line_count = 1 out &&
373391
374392
echo 0 >expect &&
375393
git cat-file -p base:sub/file >>expect &&
@@ -426,10 +444,14 @@ test_expect_success 'handle rename/rename (2to1) conflict correctly' '
426444
test_must_fail git merge -s recursive C^0 >out &&
427445
test_i18ngrep "CONFLICT (rename/rename)" out &&
428446
429-
test 2 -eq $(git ls-files -s | wc -l) &&
430-
test 2 -eq $(git ls-files -u | wc -l) &&
431-
test 2 -eq $(git ls-files -u c | wc -l) &&
432-
test 3 -eq $(git ls-files -o | wc -l) &&
447+
git ls-files -s >out &&
448+
test_line_count = 2 out &&
449+
git ls-files -u >out &&
450+
test_line_count = 2 out &&
451+
git ls-files -u c >out &&
452+
test_line_count = 2 out &&
453+
git ls-files -o >out &&
454+
test_line_count = 3 out &&
433455
434456
test ! -f a &&
435457
test ! -f b &&
@@ -476,9 +498,12 @@ test_expect_success 'merge has correct working tree contents' '
476498
477499
test_must_fail git merge -s recursive B^0 &&
478500
479-
test 3 -eq $(git ls-files -s | wc -l) &&
480-
test 3 -eq $(git ls-files -u | wc -l) &&
481-
test 0 -eq $(git ls-files -o | wc -l) &&
501+
git ls-files -s >out &&
502+
test_line_count = 3 out &&
503+
git ls-files -u >out &&
504+
test_line_count = 3 out &&
505+
git ls-files -o >out &&
506+
test_line_count = 1 out &&
482507
483508
test $(git rev-parse :1:a) = $(git rev-parse A:a) &&
484509
test $(git rev-parse :3:b) = $(git rev-parse A:a) &&
@@ -527,8 +552,10 @@ test_expect_failure 'detect conflict with rename/rename(1to2)/add-source merge'
527552
528553
test_must_fail git merge -s recursive C^0 &&
529554
530-
test 4 -eq $(git ls-files -s | wc -l) &&
531-
test 0 -eq $(git ls-files -o | wc -l) &&
555+
git ls-files -s >out &&
556+
test_line_count = 4 out &&
557+
git ls-files -o >out &&
558+
test_line_count = 1 out &&
532559
533560
test $(git rev-parse 3:a) = $(git rev-parse C:a) &&
534561
test $(git rev-parse 1:a) = $(git rev-parse A:a) &&
@@ -573,8 +600,10 @@ test_expect_failure 'rename/rename/add-source still tracks new a file' '
573600
git checkout C^0 &&
574601
git merge -s recursive B^0 &&
575602
576-
test 2 -eq $(git ls-files -s | wc -l) &&
577-
test 0 -eq $(git ls-files -o | wc -l) &&
603+
git ls-files -s >out &&
604+
test_line_count = 2 out &&
605+
git ls-files -o >out &&
606+
test_line_count = 1 out &&
578607
579608
test $(git rev-parse HEAD:a) = $(git rev-parse C:a) &&
580609
test $(git rev-parse HEAD:b) = $(git rev-parse A:a)
@@ -615,10 +644,14 @@ test_expect_success 'rename/rename/add-dest merge still knows about conflicting
615644
git checkout C^0 &&
616645
test_must_fail git merge -s recursive B^0 &&
617646
618-
test 5 -eq $(git ls-files -s | wc -l) &&
619-
test 2 -eq $(git ls-files -u b | wc -l) &&
620-
test 2 -eq $(git ls-files -u c | wc -l) &&
621-
test 4 -eq $(git ls-files -o | wc -l) &&
647+
git ls-files -s >out &&
648+
test_line_count = 5 out &&
649+
git ls-files -u b >out &&
650+
test_line_count = 2 out &&
651+
git ls-files -u c >out &&
652+
test_line_count = 2 out &&
653+
git ls-files -o >out &&
654+
test_line_count = 5 out &&
622655
623656
test $(git rev-parse :1:a) = $(git rev-parse A:a) &&
624657
test $(git rev-parse :2:b) = $(git rev-parse C:b) &&

0 commit comments

Comments
 (0)