| Message ID | patch-v2-1.1-d7d071441b0-20210730T161540Z-avarab@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 22ecd02929ee3152aaf664d8bb70168c3c936dd8 |
| Headers | show |
| Series | [v2] t0001: fix broken not-quite getcwd(3) test in bed67874e2 | expand |
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes: > The problem with that fix is that while its analysis of the problem is > correct, it doesn't actually call getcwd(3), instead it invokes "pwd > -P". There is no guarantee that "pwd -P" is going to call getcwd(3), > as opposed to e.g. being a shell built-in. > > On AIX under both bash and ksh this test breaks because "pwd -P" will > happily display the current working directory, but getcwd(3) called by > the "git init" we're testing here will fail to get it. Well described. And logically it leads to "when we want to know getcwd() is OK to use, trying to run getcwd() to see it works is the right way to do so", which is your test-getcwd.c? Nice. Will queue. > diff --git a/t/helper/test-tool.c b/t/helper/test-tool.c > index 490ac026c51..3ce5585e53a 100644 > --- a/t/helper/test-tool.c > +++ b/t/helper/test-tool.c > @@ -33,6 +33,7 @@ static struct test_cmd cmds[] = { > { "fast-rebase", cmd__fast_rebase }, > { "genrandom", cmd__genrandom }, > { "genzeros", cmd__genzeros }, > + { "getcwd", cmd__getcwd }, > { "hashmap", cmd__hashmap }, > { "hash-speed", cmd__hash_speed }, > { "index-version", cmd__index_version }, > diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h > index f8dc266721f..9f0f5228508 100644 > --- a/t/helper/test-tool.h > +++ b/t/helper/test-tool.h > @@ -23,6 +23,7 @@ int cmd__example_decorate(int argc, const char **argv); > int cmd__fast_rebase(int argc, const char **argv); > int cmd__genrandom(int argc, const char **argv); > int cmd__genzeros(int argc, const char **argv); > +int cmd__getcwd(int argc, const char **argv); > int cmd__hashmap(int argc, const char **argv); > int cmd__hash_speed(int argc, const char **argv); > int cmd__index_version(int argc, const char **argv); > diff --git a/t/t0001-init.sh b/t/t0001-init.sh > index acd662e403b..df544bb321f 100755 > --- a/t/t0001-init.sh > +++ b/t/t0001-init.sh > @@ -356,7 +356,10 @@ test_lazy_prereq GETCWD_IGNORES_PERMS ' > chmod 100 $base || > BUG "cannot prepare $base" > > - (cd $base/dir && /bin/pwd -P) > + ( > + cd $base/dir && > + test-tool getcwd > + ) > status=$? > > chmod 700 $base &&
diff --git a/Makefile b/Makefile index c6f6246bf63..9573190f1d7 100644 --- a/Makefile +++ b/Makefile @@ -715,6 +715,7 @@ TEST_BUILTINS_OBJS += test-example-decorate.o TEST_BUILTINS_OBJS += test-fast-rebase.o TEST_BUILTINS_OBJS += test-genrandom.o TEST_BUILTINS_OBJS += test-genzeros.o +TEST_BUILTINS_OBJS += test-getcwd.o TEST_BUILTINS_OBJS += test-hash-speed.o TEST_BUILTINS_OBJS += test-hash.o TEST_BUILTINS_OBJS += test-hashmap.o diff --git a/t/helper/test-getcwd.c b/t/helper/test-getcwd.c new file mode 100644 index 00000000000..d680038a780 --- /dev/null +++ b/t/helper/test-getcwd.c @@ -0,0 +1,26 @@ +#include "test-tool.h" +#include "git-compat-util.h" +#include "parse-options.h" + +static const char *getcwd_usage[] = { + "test-tool getcwd", + NULL +}; + +int cmd__getcwd(int argc, const char **argv) +{ + struct option options[] = { + OPT_END() + }; + char *cwd; + + argc = parse_options(argc, argv, "test-tools", options, getcwd_usage, 0); + if (argc > 0) + usage_with_options(getcwd_usage, options); + + cwd = xgetcwd(); + puts(cwd); + free(cwd); + + return 0; +} diff --git a/t/helper/test-tool.c b/t/helper/test-tool.c index 490ac026c51..3ce5585e53a 100644 --- a/t/helper/test-tool.c +++ b/t/helper/test-tool.c @@ -33,6 +33,7 @@ static struct test_cmd cmds[] = { { "fast-rebase", cmd__fast_rebase }, { "genrandom", cmd__genrandom }, { "genzeros", cmd__genzeros }, + { "getcwd", cmd__getcwd }, { "hashmap", cmd__hashmap }, { "hash-speed", cmd__hash_speed }, { "index-version", cmd__index_version }, diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h index f8dc266721f..9f0f5228508 100644 --- a/t/helper/test-tool.h +++ b/t/helper/test-tool.h @@ -23,6 +23,7 @@ int cmd__example_decorate(int argc, const char **argv); int cmd__fast_rebase(int argc, const char **argv); int cmd__genrandom(int argc, const char **argv); int cmd__genzeros(int argc, const char **argv); +int cmd__getcwd(int argc, const char **argv); int cmd__hashmap(int argc, const char **argv); int cmd__hash_speed(int argc, const char **argv); int cmd__index_version(int argc, const char **argv); diff --git a/t/t0001-init.sh b/t/t0001-init.sh index acd662e403b..df544bb321f 100755 --- a/t/t0001-init.sh +++ b/t/t0001-init.sh @@ -356,7 +356,10 @@ test_lazy_prereq GETCWD_IGNORES_PERMS ' chmod 100 $base || BUG "cannot prepare $base" - (cd $base/dir && /bin/pwd -P) + ( + cd $base/dir && + test-tool getcwd + ) status=$? chmod 700 $base &&