From f78b1c5f8237d68fffe7c04d22bf93f2ad0bc730 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 27 Apr 2012 11:25:25 +0200 Subject: [PATCH] t9002: work around shells that are unable to set COLUMNS to 1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Junio C Hamano --- t/t9002-column.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/t/t9002-column.sh b/t/t9002-column.sh index ec288aeb9..fb71949eb 100755 --- 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 actual && test_cmp expected actual ' -- 2.26.2