From: Armin Kunaschik <megabreit@googlemail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
Git List <git@vger.kernel.org>
Subject: Re: t7800 test failure
Date: Wed, 25 May 2016 11:33:33 +0200 [thread overview]
Message-ID: <CALR6jEixZitA1CTE_kDkDEHv59ALT9zkCOgd28unMhLUZKt48Q@mail.gmail.com> (raw)
In-Reply-To: <xmqqfut75peg.fsf@gitster.mtv.corp.google.com>
On Tue, May 24, 2016 at 7:36 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Armin Kunaschik <megabreit@googlemail.com> writes:
>>
>> Ok, how can this be implemented within the test environment?
>
> I actually think an unconditional check like this is sufficient.
Ah, good. My thoughts were a bit more complicated.
Anyway, this works for me.
Thanks!
> t/t7800-difftool.sh | 17 +++++++++--------
> 1 file changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
> index 7ce4cd7..f304228 100755
> --- a/t/t7800-difftool.sh
> +++ b/t/t7800-difftool.sh
> @@ -442,15 +442,16 @@ run_dir_diff_test 'difftool --dir-diff with unmerged files' '
> test_cmp expect actual
> '
>
> -write_script .git/CHECK_SYMLINKS <<\EOF
> -for f in file file2 sub/sub
> -do
> - echo "$f"
> - readlink "$2/$f"
> -done >actual
> -EOF
> -
> test_expect_success PERL,SYMLINKS 'difftool --dir-diff --symlink without unstaged changes' '
> +
> + write_script .git/CHECK_SYMLINKS <<-\EOF &&
> + for f in file file2 sub/sub
> + do
> + echo "$f"
> + ls -ld "$2/$f" | sed -e "s/.* -> //"
> + done >actual
> + EOF
> +
> cat >expect <<-EOF &&
> file
> $PWD/file
next prev parent reply other threads:[~2016-05-25 9:33 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-24 15:53 t7800 test failure Armin Kunaschik
2016-05-24 16:48 ` Matthieu Moy
2016-05-24 16:57 ` Junio C Hamano
2016-05-24 17:20 ` Armin Kunaschik
2016-05-24 17:36 ` Junio C Hamano
2016-05-25 9:33 ` Armin Kunaschik [this message]
2016-05-27 4:19 ` David Aguilar
2016-05-27 7:48 ` Matthieu Moy
2016-05-31 0:26 ` [PATCH] t7800 readlink not found Armin Kunaschik
2016-05-31 5:06 ` Torsten Bögershausen
2016-05-31 5:51 ` Junio C Hamano
2016-06-21 14:44 ` Armin Kunaschik
2016-06-21 18:39 ` Junio C Hamano
2016-06-21 20:30 ` Torsten Bögershausen
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=CALR6jEixZitA1CTE_kDkDEHv59ALT9zkCOgd28unMhLUZKt48Q@mail.gmail.com \
--to=megabreit@googlemail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--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).