Merge branch 'jx/clean-interactive'
* jx/clean-interactive: path-utils test: rename mingw_path function to print_path
This commit is contained in:
commit
13f17f338c
@ -8,13 +8,13 @@ test_description='Test various path utilities'
|
|||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
|
|
||||||
norm_path() {
|
norm_path() {
|
||||||
expected=$(test-path-utils mingw_path "$2")
|
expected=$(test-path-utils print_path "$2")
|
||||||
test_expect_success $3 "normalize path: $1 => $2" \
|
test_expect_success $3 "normalize path: $1 => $2" \
|
||||||
"test \"\$(test-path-utils normalize_path_copy '$1')\" = '$expected'"
|
"test \"\$(test-path-utils normalize_path_copy '$1')\" = '$expected'"
|
||||||
}
|
}
|
||||||
|
|
||||||
relative_path() {
|
relative_path() {
|
||||||
expected=$(test-path-utils mingw_path "$3")
|
expected=$(test-path-utils print_path "$3")
|
||||||
test_expect_success $4 "relative path: $1 $2 => $3" \
|
test_expect_success $4 "relative path: $1 $2 => $3" \
|
||||||
"test \"\$(test-path-utils relative_path '$1' '$2')\" = '$expected'"
|
"test \"\$(test-path-utils relative_path '$1' '$2')\" = '$expected'"
|
||||||
}
|
}
|
||||||
|
@ -116,7 +116,7 @@ int main(int argc, char **argv)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (argc == 3 && !strcmp(argv[1], "mingw_path")) {
|
if (argc == 3 && !strcmp(argv[1], "print_path")) {
|
||||||
puts(argv[2]);
|
puts(argv[2]);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user