nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-09 17:38:00 +00:00
Code Issues Projects Releases Wiki Activity

test_split_into_argv: report test results sensibly.

Browse Source 
Now we say how many tests failed, and we also propagate the overall
status into the exit code.
This commit is contained in:
Simon Tatham 2021-04-18 12:13:39 +01:00
parent 49b91bc128
commit d01f682f32
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
windows/utils/split_into_argv.c
View File

@ -646,10 +646,12 @@ int main(int argc, char **argv)
* If we get here, we were invoked with no arguments, so just * If we get here, we were invoked with no arguments, so just
* run the tests. * run the tests.
*/ */
int passes = 0, fails = 0;
for (i = 0; i < lenof(argv_tests); i++) { for (i = 0; i < lenof(argv_tests); i++) {
int ac; int ac;
char **av; char **av;
bool failed = false;
split_into_argv((char *)argv_tests[i].cmdline, &ac, &av, NULL); split_into_argv((char *)argv_tests[i].cmdline, &ac, &av, NULL);
@ -658,6 +660,7 @@ int main(int argc, char **argv)
printf("failed test %d (|%s|) arg %d: |%s| should be |%s|\n", printf("failed test %d (|%s|) arg %d: |%s| should be |%s|\n",
i, argv_tests[i].cmdline, i, argv_tests[i].cmdline,
j, av[j], argv_tests[i].argv[j]); j, av[j], argv_tests[i].argv[j]);
failed = true;
} }
#ifdef VERBOSE #ifdef VERBOSE
else { else {
@ -667,15 +670,33 @@ int main(int argc, char **argv)
} }
#endif #endif
} }
if (j < ac) if (j < ac) {
printf("failed test %d (|%s|): %d args returned, should be %d\n", printf("failed test %d (|%s|): %d args returned, should be %d\n",
i, argv_tests[i].cmdline, ac, j); i, argv_tests[i].cmdline, ac, j);
if (argv_tests[i].argv[j]) failed = true;
}
if (argv_tests[i].argv[j]) {
printf("failed test %d (|%s|): %d args returned, should be more\n", printf("failed test %d (|%s|): %d args returned, should be more\n",
i, argv_tests[i].cmdline, ac); i, argv_tests[i].cmdline, ac);
failed = true;
}
if (failed)
fails++;
else
passes++;
} }
return 0; printf("passed %d failed %d (%s mode)\n",
passes, fails,
#if MOD3
"mod 3"
#else
"mod 2"
#endif
);
return fails != 0;
} }
#endif /* TEST */ #endif /* TEST */