Hi Torsten,
On Wed, 13 Jan 2016, Torsten Bögershausen wrote:
> On 01/13/2016 03:56 AM, Junio C Hamano wrote:
> > Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxxx> writes:
> >
> > > Hi Johannes,
> > > ...
> > > I was somewhat disappointed that you ignored the implementation of
> > > gitbasename() and gitdirname() that was included in the test-libgen.c
> > > file that I sent you. I had hoped they would be (at worst) a good
> > > starting
> > > point if you found them to be lacking for your use case (ie. for the
> > > 64-bit versions of MSVC/MinGW).
> > Sorry to hear that, but the 'next' branch has just been rewound and
> > rebuilt with this series, so it is too late to replace them with
> > another round of reroll. It however is never too late to improve
> > with incremental updates, though, so please work together and send
> > in a follow-up patch series as/if needed.
> >
> Is there a chance to keep it in next (and not merge to master) until
> we have found a solution for the broken t0060 test under Mac OS X ?
This is actually independent of follow-up patches that might replace the
gitbasename()/gitdirname() functions wholesale, as the problem you
encountered is *differing* behavior: no matter what implementation of
gitdirname() we use, it will either agree with dirname() on Linux or with
dirname() on MacOSX, it cannot do both.
So here is a hot-fix (Junio, would you kindly apply it?):
-- snipsnap --
Subject: [PATCH] t0060: fix dirname test on MacOSX
Contrary to this developer's assumptions, the behavior of dirname("//") is
not consistent between platforms. Let's document this by not removing this
test case, but showing that it behaves differently on MacOSX (unless
NO_LIBGEN_H is defined, that is).
Pointed-out-by: Torsten Bögershausen <tboegi@xxxxxx>
Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
---
test-path-utils.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/test-path-utils.c b/test-path-utils.c
index 4ab68ac..a3a69ce 100644
--- a/test-path-utils.c
+++ b/test-path-utils.c
@@ -142,7 +142,11 @@ static struct test_data dirname_data[] = {
{ ".", "." },
{ "..", "." },
{ "/", "/" },
+#if defined(__APPLE__) && !defined(NO_LIBGEN_H)
+ { "//", "/" },
+#else
{ "//", "//" },
+#endif
#if defined(__CYGWIN__) && !defined(NO_LIBGEN_H)
{ "///", "//" },
{ "////", "//" },
--
2.6.3.windows.1.300.g1c25e49