[PATCH 2/4] Fold test-absolute-path into test-path-utils
From: David Reiss <hidden>
Date: 2016-06-15 22:44:37
Subsystem:
kernel build + files below scripts/ (unless maintained elsewhere), the rest · Maintainers:
Nathan Chancellor, Nicolas Schier, Linus Torvalds
Signed-off-by: David Reiss <redacted> --- Completely unnecessary. I just thought it might be nice to combine these to cut down on the number of test driver functions. .gitignore | 1 - Makefile | 2 +- t/t0000-basic.sh | 8 ++++---- test-absolute-path.c | 11 ----------- test-path-utils.c | 8 ++++++++ 5 files changed, 13 insertions(+), 17 deletions(-) delete mode 100644 test-absolute-path.c
diff --git a/.gitignore b/.gitignore
index c54c473..31ea9f1 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
diff --git a/Makefile b/Makefile
index d76c16b..cda7ab1 100644
--- a/Makefile
+++ b/Makefile@@ -1182,7 +1182,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 27b54cb..9745f25 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 c959ea2..0000000
--- 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 1bd4321..842b580 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; }
--
1.5.4