t4052: work around shells unable to set COLUMNS to 1

Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Zbigniew Jędrzejewski-Szmek 2012-04-27 11:25:25 +02:00 committed by Junio C Hamano
parent d4958d30f8
commit bafa16e53c
1 changed files with 4 additions and 2 deletions

View File

@ -292,7 +292,8 @@ cat >expect1-graph <<'EOF'
EOF EOF
while read verb expect cmd args while read verb expect cmd args
do do
test_expect_success "$cmd $verb prefix greater than COLUMNS (big change)" ' test_expect_success COLUMNS_CAN_BE_1 \
"$cmd $verb prefix greater than COLUMNS (big change)" '
COLUMNS=1 git $cmd $args >output COLUMNS=1 git $cmd $args >output
grep " | " output >actual && grep " | " output >actual &&
test_cmp "$expect" actual test_cmp "$expect" actual
@ -300,7 +301,8 @@ do


test "$cmd" != diff || continue test "$cmd" != diff || continue


test_expect_success "$cmd --graph $verb prefix greater than COLUMNS (big change)" ' test_expect_success COLUMNS_CAN_BE_1 \
"$cmd --graph $verb prefix greater than COLUMNS (big change)" '
COLUMNS=1 git $cmd $args --graph >output COLUMNS=1 git $cmd $args --graph >output
grep " | " output >actual && grep " | " output >actual &&
test_cmp "$expect-graph" actual test_cmp "$expect-graph" actual