t9002: work around shells that are unable to set COLUMNS to 1

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>

diff --git a/t/t9002-column.sh b/t/t9002-column.sh
index ec288aeb95e70d9f9e47ce28284a89b8497d0bca..fb71949ebd1f52b64ae82e22987e51385bb6400a 100755 (executable)
--- a/t/t9002-column.sh
+++ b/t/t9002-column.sh
@@ -50,8 +50,7 @@ EOF
        test_cmp expected actual
 '
 
-test_expect_success 'COLUMNS = 1' '
-       cat >expected <<\EOF &&
+cat >expected <<\EOF
 one
 two
 three
@@ -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
 '