diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2013-10-14 11:03:48 -0700 |
|---|---|---|
| committer | Jonathan Nieder <jrnieder@gmail.com> | 2013-10-14 11:03:48 -0700 |
| commit | 13f17f338c7edfdd60dc152c82f6393a3c4bc381 (patch) | |
| tree | 352d2e4a8e391a5b72e7781f6b33d70ccf165e95 | |
| parent | Merge branch 'jk/diff-algo' (diff) | |
| parent | path-utils test: rename mingw_path function to print_path (diff) | |
| download | tgif-13f17f338c7edfdd60dc152c82f6393a3c4bc381.tar.xz | |
Merge branch 'jx/clean-interactive'
* jx/clean-interactive:
path-utils test: rename mingw_path function to print_path
| -rwxr-xr-x | t/t0060-path-utils.sh | 4 | ||||
| -rw-r--r-- | test-path-utils.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh index 3a48de20d8..2bd5e32745 100755 --- a/t/t0060-path-utils.sh +++ b/t/t0060-path-utils.sh @@ -8,13 +8,13 @@ test_description='Test various path utilities' . ./test-lib.sh 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 \"\$(test-path-utils normalize_path_copy '$1')\" = '$expected'" } 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 \"\$(test-path-utils relative_path '$1' '$2')\" = '$expected'" } diff --git a/test-path-utils.c b/test-path-utils.c index bb975e4d3e..3dd3744a57 100644 --- a/test-path-utils.c +++ b/test-path-utils.c @@ -116,7 +116,7 @@ int main(int argc, char **argv) return 0; } - if (argc == 3 && !strcmp(argv[1], "mingw_path")) { + if (argc == 3 && !strcmp(argv[1], "print_path")) { puts(argv[2]); return 0; } |