diff options
| author | David Reiss <dreiss@facebook.com> | 2008-05-19 23:49:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-23 14:15:01 -0700 |
| commit | d553e737897e8edbbc2092bf345fc58b2dae5251 (patch) | |
| tree | 9de693a3d6cd4f0f76674925adc752476f4d00c5 | |
| parent | ae299be0e5e610027e6492d48d70c1cbb0e9edd8 (diff) | |
| download | git-d553e737897e8edbbc2092bf345fc58b2dae5251.tar.gz git-d553e737897e8edbbc2092bf345fc58b2dae5251.tar.xz | |
Fold test-absolute-path into test-path-utils
Signed-off-by: David Reiss <dreiss@facebook.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | t/t0000-basic.sh | 8 | ||||
| -rw-r--r-- | test-absolute-path.c | 11 | ||||
| -rw-r--r-- | test-path-utils.c | 8 |
5 files changed, 13 insertions, 17 deletions
diff --git a/.gitignore b/.gitignore index c54c473e9..31ea9f13b 100644 --- a/.gitignore +++ b/.gitignore @@ -142,7 +142,6 @@ git-write-tree git-core-*/?* gitk-wish gitweb/gitweb.cgi -test-absolute-path test-chmtime test-date test-delta @@ -1186,7 +1186,7 @@ endif ### Testing rules -TEST_PROGRAMS = test-chmtime$X test-genrandom$X test-date$X test-delta$X test-sha1$X test-match-trees$X test-absolute-path$X test-parse-options$X test-path-utils$X +TEST_PROGRAMS = test-chmtime$X test-genrandom$X test-date$X test-delta$X test-sha1$X test-match-trees$X test-parse-options$X test-path-utils$X all:: $(TEST_PROGRAMS) diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh index 690f80ab2..d7cbc5c6d 100755 --- a/t/t0000-basic.sh +++ b/t/t0000-basic.sh @@ -301,14 +301,14 @@ test_expect_success 'absolute path works as expected' ' mkdir third && dir="$(cd .git; pwd -P)" && dir2=third/../second/other/.git && - test "$dir" = "$(test-absolute-path $dir2)" && + test "$dir" = "$(test-path-utils make_absolute_path $dir2)" && file="$dir"/index && - test "$file" = "$(test-absolute-path $dir2/index)" && + test "$file" = "$(test-path-utils make_absolute_path $dir2/index)" && basename=blub && - test "$dir/$basename" = "$(cd .git && test-absolute-path "$basename")" && + test "$dir/$basename" = "$(cd .git && test-path-utils make_absolute_path "$basename")" && ln -s ../first/file .git/syml && sym="$(cd first; pwd -P)"/file && - test "$sym" = "$(test-absolute-path "$dir2/syml")" + test "$sym" = "$(test-path-utils make_absolute_path "$dir2/syml")" ' test_expect_success 'very long name in the index handled sanely' ' diff --git a/test-absolute-path.c b/test-absolute-path.c deleted file mode 100644 index c959ea20d..000000000 --- a/test-absolute-path.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "cache.h" - -int main(int argc, char **argv) -{ - while (argc > 1) { - puts(make_absolute_path(argv[1])); - argc--; - argv++; - } - return 0; -} diff --git a/test-path-utils.c b/test-path-utils.c index 1bd43216f..842b58018 100644 --- a/test-path-utils.c +++ b/test-path-utils.c @@ -9,5 +9,13 @@ int main(int argc, char **argv) puts(buf); } + if (argc >= 2 && !strcmp(argv[1], "make_absolute_path")) { + while (argc > 2) { + puts(make_absolute_path(argv[2])); + argc--; + argv++; + } + } + return 0; } |