Re: [PATCH 4/5] Test and fix normalize_path_copy()
- From
René Scharfe <rene.scharfe@lsrfire.ath.cx>
- Date
- Feb 8, 2009, 14:46 UTC
- Message-ID
- <498EF028.3040702@lsrfire.ath.cx>
- In-Reply-To
- <1234019311-6449-5-git-send-email-j6t@kdbg.org>
Johannes Sixt schrieb:
> Moreover, the test case descriptions of t0060 now include the test data and > expected outcome.
The test still fails in a lot of cases for me, because "/" is translated to the installation path of msys. E.g. with the patch at the end, which shows the results in addition to input and expected output, I get several cases like this (the first test call checks the return code):
* FAIL 2: normalize absolute: '/' => '/' test 0 = 0 && test 'C:/Program Files (x86)/msysgit/msysgit' = '/'
* FAIL 32: longest ancestor: '/foo' '/' => '0' test 0 = 0 && test '38' = '0'
I'm not sure what to do about it. Should test-path-utils translate it back into "root is / is root"? Should the test script look up "/" at the top and just append this value to all paths? Unpretty.
And then there's this:
* FAIL 7: normalize absolute: '/./..' => '++failed++' test 0 = 0 && test 'C:/Program Files (x86)/msysgit/msysgit' = '++failed++' * ok 8: normalize absolute: '/../.' => '++failed++'
A printf() added to the top of normalize_path_copy() tells me that you can add as many "/.." as you want after a path starting with "/.", it will always translate into the install directory of msys regardless.
Anyway, here's the patch mentioned above:
diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh index 4ed1f0b..d5a38a6 100755 --- a/t/t0060-path-utils.sh +++ b/t/t0060-path-utils.sh @@ -8,13 +8,17 @@ test_description='Test various path utilities' . ./test-lib.sh norm_abs() { - test_expect_success "normalize absolute: $1 => $2" \ - "test \"\$(test-path-utils normalize_path_copy '$1')\" = '$2'" + result=$(test-path-utils normalize_path_copy "$1") + rc=$? + test_expect_success "normalize absolute: '$1' => '$2'" \ + "test $rc = 0 && test '$result' = '$2'" } ancestor() { - test_expect_success "longest ancestor: $1 $2 => $3" \ - "test \"\$(test-path-utils longest_ancestor_length '$1' '$2')\" = '$3'" + result=$(test-path-utils longest_ancestor_length "$1" "$2") + rc=$? + test_expect_success "longest ancestor: '$1' '$2' => '$3'" \ + "test $rc = 0 && test '$result' = '$3'" } norm_abs "" ""