git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Elijah Newren <newren@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, Elijah Newren <newren@gmail.com>
Subject: [PATCH 0/5] Modernize some testcases for merge-recursive corner cases
Date: Thu, 24 May 2018 00:04:34 -0700	[thread overview]
Message-ID: <20180524070439.6367-1-newren@gmail.com> (raw)

I have about a dozen more testcases I want to add to the testsuite, in
order to document additional situations that merge-recursive handles
suboptimally.  To avoid sending an excessively long series, I am splitting
this up.  This series just aims to modernize a pair of testfiles in which
several of the new tests would most naturally belong.  This modernization
serves two purposes: (1) it makes the existing tests easier to understand,
and (2) it simplifies adding more tests to these test files.

Elijah Newren (5):
  t6036, t6042: use test_create_repo to keep tests independent
  t6036, t6042: use test_line_count instead of wc -l
  t6036, t6042: prefer test_path_is_file, test_path_is_missing
  t6036, t6042: prefer test_cmp to sequences of test
  t6036: prefer test_when_finished to manual cleanup in following test

 t/t6036-recursive-corner-cases.sh    | 991 +++++++++++++++------------
 t/t6042-merge-rename-corner-cases.sh | 968 ++++++++++++++------------
 2 files changed, 1098 insertions(+), 861 deletions(-)

-- 
2.17.0.1.gda85003413


             reply	other threads:[~2018-05-24  7:04 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-24  7:04 Elijah Newren [this message]
2018-05-24  7:04 ` [PATCH 1/5] t6036, t6042: use test_create_repo to keep tests independent Elijah Newren
2018-05-24  7:04 ` [PATCH 2/5] t6036, t6042: use test_line_count instead of wc -l Elijah Newren
2018-05-24 10:05   ` SZEDER Gábor
2018-05-24 10:36     ` SZEDER Gábor
2018-05-24 17:03     ` Elijah Newren
2018-05-25  1:17     ` Junio C Hamano
2018-05-26  0:44       ` Elijah Newren
2018-05-24  7:04 ` [PATCH 3/5] t6036, t6042: prefer test_path_is_file, test_path_is_missing Elijah Newren
2018-05-24  7:04 ` [PATCH 4/5] t6036, t6042: prefer test_cmp to sequences of test Elijah Newren
2018-05-24  7:04 ` [PATCH 5/5] t6036: prefer test_when_finished to manual cleanup in following test Elijah Newren

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180524070439.6367-1-newren@gmail.com \
    --to=newren@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).