diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2012-04-27 11:25:25 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-04-27 09:28:10 -0700 |
commit | bafa16e53c8845f3d3b7713dcbef8a5c841cadad (patch) | |
tree | 99873067bdef8293fd44fe92dfffe8af22c6de6a | |
parent | Merge branch 'zj/mksh-columns-breakage' into lp/diffstat-with-graph (diff) | |
download | tgif-bafa16e53c8845f3d3b7713dcbef8a5c841cadad.tar.xz |
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>
-rwxr-xr-x | t/t4052-stat-output.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t4052-stat-output.sh b/t/t4052-stat-output.sh index ced32dbbca..ddd94976c2 100755 --- a/t/t4052-stat-output.sh +++ b/t/t4052-stat-output.sh @@ -292,7 +292,8 @@ cat >expect1-graph <<'EOF' EOF while read verb expect cmd args 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 grep " | " output >actual && test_cmp "$expect" actual @@ -300,7 +301,8 @@ do 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 grep " | " output >actual && test_cmp "$expect-graph" actual |