@matheusbsbs / matheus-bagliano / commits / 22f0df7a09

test-tool run-command testsuite: get shell from env

When running tests through `test-tool run-command testsuite`, we currently hardcode `sh` as the command interpreter. As discussed in [1], this is incorrect, and we should be using the shell set in TEST_SHELL_PATH instead. Add a shell_path field in struct testsuite so that we can pass this to the task runner callback. If this is non-null, we'll use it as the argv[0] of the subprocess. Otherwise, we'll just execute the test program directly. We will use this feature in a later commit to enable running binary executable unit tests. However, for now when setting up the struct testsuite in testsuite(), use the value of TEST_SHELL_PATH if it's set, otherwise keep the original behavior by defaulting to `sh`. [1] https://lore.kernel.org/git/20240123005913.GB835964@coredump.intra.peff.net/ 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 22f0df7a093182eeaf5e6da957d20ae8b858679f

1 file changed +8 -1

t/helper/test-run-command.c

+8 -1

@@ -65,6 +65,7 @@ struct testsuite {

65 struct string_list tests, failed;

66 int next;

67 int quiet, immediate, verbose, verbose_log, trace, write_junit_xml;

68 + const char *shell_path;

69 };

70 #define TESTSUITE_INIT { \

71 .tests = STRING_LIST_INIT_DUP, \

@@ -80,7 +81,9 @@ static int next_test(struct child_process *cp, struct strbuf *err, void *cb,

81 return 0;

83 test = suite->tests.items[suite->next++].string;

83 - strvec_pushl(&cp->args, "sh", test, NULL);

84 + if (suite->shell_path)

85 + strvec_push(&cp->args, suite->shell_path);

86 + strvec_push(&cp->args, test);

87 if (suite->quiet)

88 strvec_push(&cp->args, "--quiet");

89 if (suite->immediate)

@@ -162,6 +165,10 @@ static int testsuite(int argc, const char **argv)

165 if (max_jobs <= 0)

166 max_jobs = online_cpus();

167

168 + suite.shell_path = getenv("TEST_SHELL_PATH");

169 + if (!suite.shell_path)

170 + suite.shell_path = "sh";

171 +

172 dir = opendir(".");

173 if (!dir)

174 die("Could not open the current directory");