summaryrefslogtreecommitdiff
path: root/t/helper/test-run-command.c
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2019-09-19 22:12:37 (GMT)
committerJohannes Schindelin <johannes.schindelin@gmx.de>2019-12-05 14:37:06 (GMT)
commit379e51d1ae668a1f26d50eb59b3f8befc1eb8883 (patch)
treeecabfba07ded9ef567af1545e686b71f30cfbee0 /t/helper/test-run-command.c
parent7530a6287e20a74b9fe6d4ca3a66df0f0f5cc52c (diff)
downloadgit-379e51d1ae668a1f26d50eb59b3f8befc1eb8883.zip
git-379e51d1ae668a1f26d50eb59b3f8befc1eb8883.tar.gz
git-379e51d1ae668a1f26d50eb59b3f8befc1eb8883.tar.bz2
quote-stress-test: offer to test quoting arguments for MSYS2 sh
It is unfortunate that we need to quote arguments differently on Windows, depending whether we build a command-line for MSYS2's `sh` or for other Windows executables. We already have a test helper to verify the latter, with this patch we can also verify the former. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Diffstat (limited to 't/helper/test-run-command.c')
-rw-r--r--t/helper/test-run-command.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/t/helper/test-run-command.c b/t/helper/test-run-command.c
index 07989f7..b622334 100644
--- a/t/helper/test-run-command.c
+++ b/t/helper/test-run-command.c
@@ -67,12 +67,13 @@ static int quote_stress_test(int argc, const char **argv)
* were passed in.
*/
char special[] = ".?*\\^_\"'`{}()[]<>@~&+:;$%"; // \t\r\n\a";
- int i, j, k, trials = 100, skip = 0;
+ int i, j, k, trials = 100, skip = 0, msys2 = 0;
struct strbuf out = STRBUF_INIT;
struct argv_array args = ARGV_ARRAY_INIT;
struct option options[] = {
OPT_INTEGER('n', "trials", &trials, "Number of trials"),
OPT_INTEGER('s', "skip", &skip, "Skip <n> trials"),
+ OPT_BOOL('m', "msys2", &msys2, "Test quoting for MSYS2's sh"),
OPT_END()
};
const char * const usage[] = {
@@ -82,14 +83,20 @@ static int quote_stress_test(int argc, const char **argv)
argc = parse_options(argc, argv, NULL, options, usage, 0);
+ setenv("MSYS_NO_PATHCONV", "1", 0);
+
for (i = 0; i < trials; i++) {
struct child_process cp = CHILD_PROCESS_INIT;
size_t arg_count, arg_offset;
int ret = 0;
argv_array_clear(&args);
- argv_array_pushl(&args, "test-run-command",
- "quote-echo", NULL);
+ if (msys2)
+ argv_array_pushl(&args, "sh", "-c",
+ "printf %s\\\\0 \"$@\"", "skip", NULL);
+ else
+ argv_array_pushl(&args, "test-run-command",
+ "quote-echo", NULL);
arg_offset = args.argc;
if (argc > 0) {