Re: [PATCH v2 4/4] t0060: verify that basename() and dirname() work as expected
- From
Michael Blume <blume.mike@gmail.com>
- Date
- Jan 13, 2016, 18:52 UTC
- Message-ID
- <CAO2U3QjYukb4mB414mVLX2=CxLPBnDaUyDRsfitE_bTZv8_zFQ@mail.gmail.com>
- In-Reply-To
- <eca740dbf6271bd69f2ccb14163175996ef7c837.1452270051.git.johannes.schindelin@gmx.de>
On Fri, Jan 8, 2016 at 8:21 AM, Johannes Schindelin <johannes.schindelin@gmx.de> wrote:
Show 220 quoted lines
> Unfortunately, some libgen implementations yield outcomes different from
> what Git expects. For example, mingw-w64-crt provides a basename()
> function, that shortens `path0/` to `path`!
>
> So let's verify that the basename() and dirname() functions we use conform
> to what Git expects.
>
> Derived-from-code-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> t/t0060-path-utils.sh | 3 +
> test-path-utils.c | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 171 insertions(+)
>
> diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh
> index 627ef85..f0152a7 100755
> --- a/t/t0060-path-utils.sh
> +++ b/t/t0060-path-utils.sh
> @@ -59,6 +59,9 @@ case $(uname -s) in
> ;;
> esac
>
> +test_expect_success basename 'test-path-utils basename'
> +test_expect_success dirname 'test-path-utils dirname'
> +
> norm_path "" ""
> norm_path . ""
> norm_path ./ ""
> diff --git a/test-path-utils.c b/test-path-utils.c
> index c67bf65..74e74c9 100644
> --- a/test-path-utils.c
> +++ b/test-path-utils.c
> @@ -39,6 +39,168 @@ static void normalize_argv_string(const char **var, const char *input)
> die("Bad value: %s\n", input);
> }
>
> +struct test_data {
> + char *from; /* input: transform from this ... */
> + char *to; /* output: ... to this. */
> +};
> +
> +static int test_function(struct test_data *data, char *(*func)(char *input),
> + const char *funcname)
> +{
> + int failed = 0, i;
> + static char buffer[1024];
> + char *to;
> +
> + for (i = 0; data[i].to; i++) {
> + if (!data[i].from)
> + to = func(NULL);
> + else {
> + strcpy(buffer, data[i].from);
> + to = func(buffer);
> + }
> + if (strcmp(to, data[i].to)) {
> + error("FAIL: %s(%s) => '%s' != '%s'\n",
> + funcname, data[i].from, to, data[i].to);
> + failed++;
> + }
> + }
> + return !!failed;
> +}
> +
> +static struct test_data basename_data[] = {
> + /* --- POSIX type paths --- */
> + { NULL, "." },
> + { "", "." },
> + { ".", "." },
> + { "..", ".." },
> + { "/", "/" },
> +#if defined(__CYGWIN__) && !defined(NO_LIBGEN_H)
> + { "//", "//" },
> + { "///", "//" },
> + { "////", "//" },
> +#else
> + { "//", "/" },
> + { "///", "/" },
> + { "////", "/" },
> +#endif
> + { "usr", "usr" },
> + { "/usr", "usr" },
> + { "/usr/", "usr" },
> + { "/usr//", "usr" },
> + { "/usr/lib", "lib" },
> + { "usr/lib", "lib" },
> + { "usr/lib///", "lib" },
> +
> +#if defined(__MINGW32__) || defined(_MSC_VER)
> +
> + /* --- win32 type paths --- */
> + { "\\usr", "usr" },
> + { "\\usr\\", "usr" },
> + { "\\usr\\\\", "usr" },
> + { "\\usr\\lib", "lib" },
> + { "usr\\lib", "lib" },
> + { "usr\\lib\\\\\\", "lib" },
> + { "C:/usr", "usr" },
> + { "C:/usr", "usr" },
> + { "C:/usr/", "usr" },
> + { "C:/usr//", "usr" },
> + { "C:/usr/lib", "lib" },
> + { "C:usr/lib", "lib" },
> + { "C:usr/lib///", "lib" },
> + { "C:", "." },
> + { "C:a", "a" },
> + { "C:/", "/" },
> + { "C:///", "/" },
> +#if defined(NO_LIBGEN_H)
> + { "\\", "\\" },
> + { "\\\\", "\\" },
> + { "\\\\\\", "\\" },
> +#else
> +
> + /* win32 platform variations: */
> +#if defined(__MINGW32__)
> + { "\\", "/" },
> + { "\\\\", "/" },
> + { "\\\\\\", "/" },
> +#endif
> +
> +#if defined(_MSC_VER)
> + { "\\", "\\" },
> + { "\\\\", "\\" },
> + { "\\\\\\", "\\" },
> +#endif
> +
> +#endif
> +#endif
> + { NULL, "." },
> + { NULL, NULL }
> +};
> +
> +static struct test_data dirname_data[] = {
> + /* --- POSIX type paths --- */
> + { NULL, "." },
> + { "", "." },
> + { ".", "." },
> + { "..", "." },
> + { "/", "/" },
> + { "//", "//" },
> +#if defined(__CYGWIN__) && !defined(NO_LIBGEN_H)
> + { "///", "//" },
> + { "////", "//" },
> +#else
> + { "///", "/" },
> + { "////", "/" },
> +#endif
> + { "usr", "." },
> + { "/usr", "/" },
> + { "/usr/", "/" },
> + { "/usr//", "/" },
> + { "/usr/lib", "/usr" },
> + { "usr/lib", "usr" },
> + { "usr/lib///", "usr" },
> +
> +#if defined(__MINGW32__) || defined(_MSC_VER)
> +
> + /* --- win32 type paths --- */
> + { "\\", "\\" },
> + { "\\\\", "\\\\" },
> + { "\\usr", "\\" },
> + { "\\usr\\", "\\" },
> + { "\\usr\\\\", "\\" },
> + { "\\usr\\lib", "\\usr" },
> + { "usr\\lib", "usr" },
> + { "usr\\lib\\\\\\", "usr" },
> + { "C:a", "C:." },
> + { "C:/", "C:/" },
> + { "C:///", "C:/" },
> + { "C:/usr", "C:/" },
> + { "C:/usr/", "C:/" },
> + { "C:/usr//", "C:/" },
> + { "C:/usr/lib", "C:/usr" },
> + { "C:usr/lib", "C:usr" },
> + { "C:usr/lib///", "C:usr" },
> + { "\\\\\\", "\\" },
> + { "\\\\\\\\", "\\" },
> +#if defined(NO_LIBGEN_H)
> + { "C:", "C:." },
> +#else
> +
> + /* win32 platform variations: */
> +#if defined(__MINGW32__)
> + /* the following is clearly wrong ... */
> + { "C:", "." },
> +#endif
> +
> +#if defined(_MSC_VER)
> + { "C:", "C:." },
> +#endif
> +
> +#endif
> +#endif
> + { NULL, "." },
> + { NULL, NULL }
> +};
> +
> int main(int argc, char **argv)
> {
> if (argc == 3 && !strcmp(argv[1], "normalize_path_copy")) {
> @@ -133,6 +295,12 @@ int main(int argc, char **argv)
> return 0;
> }
>
> + if (argc == 2 && !strcmp(argv[1], "basename"))
> + return test_function(basename_data, basename, argv[1]);
> +
> + if (argc == 2 && !strcmp(argv[1], "dirname"))
> + return test_function(dirname_data, dirname, argv[1]);
> +
> fprintf(stderr, "%s: unknown function name: %s\n", argv[0],
> argv[1] ? argv[1] : "(there was none)");
> return 1;
> --
> 2.6.3.windows.1.300.g1c25e49
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.htmlTest fails on my Mac:
expecting success: test-path-utils dirname error: FAIL: dirname(//) => '/' != '//'
not ok 2 - dirname # test-path-utils dirname