system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 19:14:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

winetest: Add a trace in the log when skipping a subtest.

Browse source
This commit is contained in:
Francois Gouget 2010-12-09 12:05:19 +01:00 committed by Alexandre Julliard
parent 9a6f5ad239
commit aa424f8159
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
programs/winetest/main.c
View file

@ -575,8 +575,7 @@ get_subtests (const char *tempdir, struct wine_test *test, LPTSTR res_name)
test->subtests = heap_realloc (test->subtests,
allocated * sizeof(char*));
}
if (!test_filtered_out( test->name, index ))
test->subtests[test->subtest_count++] = heap_strdup(index);
test->subtests[test->subtest_count++] = heap_strdup(index);
index = strtok (NULL, whitespace);
}
test->subtests = heap_realloc (test->subtests,
@ -592,14 +591,23 @@ get_subtests (const char *tempdir, struct wine_test *test, LPTSTR res_name)
static void
run_test (struct wine_test* test, const char* subtest, HANDLE out_file, const char *tempdir)
{
int status;
const char* file = get_test_source_file(test->name, subtest);
char *cmd = strmake (NULL, "%s %s", test->exename, subtest);
xprintf ("%s:%s start %s -\n", test->name, subtest, file);
status = run_ex (cmd, out_file, tempdir, 120000);
heap_free (cmd);
xprintf ("%s:%s done (%d)\n", test->name, subtest, status);
if (test_filtered_out( test->name, subtest ))
{
report (R_STEP, "Skipping: %s:%s", test->name, subtest);
xprintf ("%s:%s skipped %s -\n", test->name, subtest, file);
}
else
{
int status;
char *cmd = strmake (NULL, "%s %s", test->exename, subtest);
report (R_STEP, "Running: %s:%s", test->name, subtest);
xprintf ("%s:%s start %s -\n", test->name, subtest, file);
status = run_ex (cmd, out_file, tempdir, 120000);
heap_free (cmd);
xprintf ("%s:%s done (%d)\n", test->name, subtest, status);
}
}
static BOOL CALLBACK
@ -924,9 +932,7 @@ run_tests (char *logname, char *outdir)
for (j = 0; j < test->subtest_count; j++) {
if (aborting) break;
report (R_STEP, "Running: %s:%s", test->name,
test->subtests[j]);
run_test (test, test->subtests[j], logfile, tempdir);
run_test (test, test->subtests[j], logfile, tempdir);
}
if (test->maindllpath) {