@matheusbsbs / matheus-bagliano / commits / a2b55e2506

test-tool run-command testsuite: support unit tests

Teach the testsuite runner in `test-tool run-command testsuite` how to run unit tests: if TEST_SHELL_PATH is not set, run the programs directly from CWD, rather than defaulting to "sh" as an interpreter. With this change, you can now use test-tool to run the unit tests: $ make $ cd t/unit-tests/bin $ ../../helper/test-tool run-command testsuite This should be helpful on Windows to allow running tests without requiring Perl (for `prove`), as discussed in [1] and [2]. This again breaks backwards compatibility, as it is now required to set TEST_SHELL_PATH properly for executing shell scripts, but again, as noted in [2], there are no longer any such invocations in our codebase. [1] https://lore.kernel.org/git/nycvar.QRO.7.76.6.2109091323150.59@tvgsbejvaqbjf.bet/ [2] https://lore.kernel.org/git/850ea42c-f103-68d5-896b-9120e2628686@gmx.de/ Signed-off-by: Josh Steadmon <steadmon@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Josh Steadmon committed May 6, 2024 at 12:57 UTC a2b55e2506f90ac2724a23e9b6c9eecf7d7fafad

1 file changed +14 -3

t/helper/test-run-command.c

+14 -3

@@ -158,6 +158,8 @@ static int testsuite(int argc, const char **argv)

158 .task_finished = test_finished,

159 .data = &suite,

160 };

161 + struct strbuf progpath = STRBUF_INIT;

162 + size_t path_prefix_len;

163

164 argc = parse_options(argc, argv, NULL, options,

165 testsuite_usage, PARSE_OPT_STOP_AT_NON_OPTION);

@@ -165,9 +167,13 @@ static int testsuite(int argc, const char **argv)

167 if (max_jobs <= 0)

168 max_jobs = online_cpus();

169

170 + /*

171 + * If we run without a shell, execute the programs directly from CWD.

172 + */

173 suite.shell_path = getenv("TEST_SHELL_PATH");

174 if (!suite.shell_path)

170 - suite.shell_path = "sh";

175 + strbuf_addstr(&progpath, "./");

176 + path_prefix_len = progpath.len;

177

178 dir = opendir(".");

179 if (!dir)

@@ -180,13 +186,17 @@ static int testsuite(int argc, const char **argv)

186

187 /* No pattern: match all */

188 if (!argc) {

183 - string_list_append(&suite.tests, p);

189 + strbuf_setlen(&progpath, path_prefix_len);

190 + strbuf_addstr(&progpath, p);

191 + string_list_append(&suite.tests, progpath.buf);

192 continue;

193 }

194

195 for (i = 0; i < argc; i++)

196 if (!wildmatch(argv[i], p, 0)) {

189 - string_list_append(&suite.tests, p);

197 + strbuf_setlen(&progpath, path_prefix_len);

198 + strbuf_addstr(&progpath, p);

199 + string_list_append(&suite.tests, progpath.buf);

200 break;

201 }

202 }

@@ -213,6 +223,7 @@ static int testsuite(int argc, const char **argv)

223

224 string_list_clear(&suite.tests, 0);

225 string_list_clear(&suite.failed, 0);

226 + strbuf_release(&progpath);

227

228 return ret;

229 }