From mboxrd@z Thu Jan 1 00:00:00 1970 From: Max Kirillov Subject: [PATCH 1/2] t6023-merge-file.sh: fix and mark as broken invalid tests Date: Sat, 28 Jun 2014 22:37:22 +0300 Message-ID: <1403984243-22717-2-git-send-email-max@max630.net> References: <1403984243-22717-1-git-send-email-max@max630.net> Cc: git@vger.kernel.org, Max Kirillov To: Bert Wesarg , Junio C Hamano , Johannes Schindelin X-From: git-owner@vger.kernel.org Sat Jun 28 21:38:41 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1X0ySO-0001wT-2f for gcvg-git-2@plane.gmane.org; Sat, 28 Jun 2014 21:38:40 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754704AbaF1Tib (ORCPT ); Sat, 28 Jun 2014 15:38:31 -0400 Received: from p3plsmtpa11-06.prod.phx3.secureserver.net ([68.178.252.107]:35334 "EHLO p3plsmtpa11-06.prod.phx3.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751017AbaF1Ti3 (ORCPT ); Sat, 28 Jun 2014 15:38:29 -0400 Received: from wheezy.local ([82.181.158.170]) by p3plsmtpa11-06.prod.phx3.secureserver.net with id KveM1o0063gsSd601veT1h; Sat, 28 Jun 2014 12:38:29 -0700 X-Mailer: git-send-email 2.0.0.526.g5318336 In-Reply-To: <1403984243-22717-1-git-send-email-max@max630.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Tests "merge without conflict (missing LF at EOF" and "merge result added missing LF" are meaningless - the first one is identical to "merge without conflict" and the second compares results of those identical tests, which are always same. This has been so since their addition in ba1f5f3537. Probably "new4.txt" was meant to be used instead of "new2.txt". Unfortunately, the current merge-file breaks with new4 - conflict is reported. They also fail at that revision if fixed. Fix the file reference to "new4.txt" and mark the tests as failing - they look like legitimate expectations, just not satisfied at time being. Signed-off-by: Max Kirillov --- t/t6023-merge-file.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh index d9f3439..6da921c 100755 --- a/t/t6023-merge-file.sh +++ b/t/t6023-merge-file.sh @@ -77,10 +77,10 @@ test_expect_success "merge without conflict (--quiet)" \ "git merge-file --quiet test.txt orig.txt new2.txt" cp new1.txt test2.txt -test_expect_success "merge without conflict (missing LF at EOF)" \ - "git merge-file test2.txt orig.txt new2.txt" +test_expect_failure "merge without conflict (missing LF at EOF)" \ + "git merge-file test2.txt orig.txt new4.txt" -test_expect_success "merge result added missing LF" \ +test_expect_failure "merge result added missing LF" \ "test_cmp test.txt test2.txt" cp test.txt backup.txt -- 2.0.0.526.g5318336