Re: [PATCH 9/8] t0060: split absolute path test in two to exercise some of it on Windows
Looks fine to me. Thanks!
Michael
On 09/09/2012 05:42 PM, Johannes Sixt wrote:
Show 39 quoted lines
> Only the first half of the test works only on POSIX, the second half
> passes on Windows as well.
>
> A later test "real path removes other extra slashes" looks very similar,
> but it does not make sense to split it in the same way: When two slashes
> are prepended in front of an absolute DOS-style path on Windows, the
> meaning of the path is changed (//server/share style), so that the test
> cannot pass on Windows.
>
> Signed-off-by: Johannes Sixt <j6t@kdbg.org>
> ---
> The series passes for me as is, but one test needs POSIX only in
> the first half. This patch splits it in two.
>
> t/t0060-path-utils.sh | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh
> index e40f764..4ef2345 100755
> --- a/t/t0060-path-utils.sh
> +++ b/t/t0060-path-utils.sh
> @@ -148,10 +148,14 @@ test_expect_success 'real path rejects the empty string' '
> test_must_fail test-path-utils real_path ""
> '
>
> -test_expect_success POSIX 'real path works on absolute paths' '
> +test_expect_success POSIX 'real path works on absolute paths 1' '
> nopath="hopefully-absent-path" &&
> test "/" = "$(test-path-utils real_path "/")" &&
> - test "/$nopath" = "$(test-path-utils real_path "/$nopath")" &&
> + test "/$nopath" = "$(test-path-utils real_path "/$nopath")"
> +'
> +
> +test_expect_success 'real path works on absolute paths 2' '
> + nopath="hopefully-absent-path" &&
> # Find an existing top-level directory for the remaining tests:
> d=$(pwd -P | sed -e "s|^\([^/]*/[^/]*\)/.*|\1|") &&
> test "$d" = "$(test-path-utils real_path "$d")" &&
>
--
Michael Haggerty
mhagger@alum.mit.edu
http://softwareswirl.blogspot.com/
Michael Haggerty <mhagger@alum.mit.edu>