Skip to content

Commit

Permalink
t9002: work around shells that are unable to set COLUMNS to 1
Browse files Browse the repository at this point in the history
In t9002-column.sh, file with expected output was shared between two
test cases, but set in the first one. Since the first test case can
now be skipped, setting up the expected output is moved outside of the
test case.

Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Zbigniew Jędrzejewski-Szmek authored and Junio C Hamano committed Apr 27, 2012
1 parent 077539d commit f78b1c5
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions t/t9002-column.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ EOF
test_cmp expected actual
'

test_expect_success 'COLUMNS = 1' '
cat >expected <<\EOF &&
cat >expected <<\EOF
one
two
three
Expand All @@ -64,6 +63,8 @@ nine
ten
eleven
EOF

test_expect_success COLUMNS_CAN_BE_1 'COLUMNS = 1' '
COLUMNS=1 git column --mode=column <lista >actual &&
test_cmp expected actual
'
Expand Down

0 comments on commit f78b1c5

Please sign in to comment.