Re: [PATCH 5/7] t0000: verify that real_path() works correctly with absolute paths
- From
Johannes Sixt <j.sixt@viscovery.net>
- Date
- Sep 5, 2012, 08:40 UTC
- Message-ID
- <50470FFB.2070204@viscovery.net>
- In-Reply-To
- <1346746470-23127-6-git-send-email-mhagger@alum.mit.edu>
Am 9/4/2012 10:14, schrieb mhagger@alum.mit.edu:
Show 20 quoted lines
> From: Michael Haggerty <mhagger@alum.mit.edu> > > There is currently a bug: if passed an absolute top-level path that > doesn't exist (e.g., "/foo") it incorrectly interprets the path as a > relative path (e.g., returns "$(pwd)/foo"). So mark the test as > failing. > > Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> > --- > t/t0000-basic.sh | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh > index 1a51634..ad002ee 100755 > --- a/t/t0000-basic.sh > +++ b/t/t0000-basic.sh > @@ -458,7 +458,17 @@ test_expect_success 'real path rejects the empty string' ' > test_must_fail test-path-utils real_path "" > ' >
These tests should really be in t0060-path-utils.sh.
Show 5 quoted lines
> -test_expect_success SYMLINKS 'real path works as expected' ' > +test_expect_failure 'real path works on absolute paths' ' > + nopath="hopefully-absent-path" && > + test "/" = "$(test-path-utils real_path "/")" && > + test "/$nopath" = "$(test-path-utils real_path "/$nopath")" &&
These tests fail on Windows because test-path-utils operates on a DOS-style absolute path even if a POSIX style absolute path is passed as argument. The best thing would be to move this to a separate test that is protected by a POSIX prerequisite (which is set in t0060).
> + # Find an existing top-level directory for the remaining tests: > + d=$(pwd -P | sed -e "s|^\(/[^/]*\)/.*|\1|") &&
pwd -P actually expands to pwd -W on Windows, and produces a DOS-style path. I suggest to insert [^/]* to skip drive letter-colon like so:
d=$(pwd -P | sed -e "s|^\([^/]*/[^/]*\)/.*|\1|") &&
> + test "$d" = "$(test-path-utils real_path "$d")" && > + test "$d/$nopath" = "$(test-path-utils real_path "$d/$nopath")"
Then these tests pass.
-- Hannes