Module: wine Branch: master Commit: b7aa196449da80786709ae6898743f7b865ea369 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7aa196449da80786709ae6898...
Author: Paul Vriens Paul.Vriens.Wine@gmail.com Date: Thu Jun 4 16:38:00 2009 +0200
shell32/tests: Fix test failure on NT4.
---
dlls/shell32/tests/shlexec.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 3460e1f..216c6d0 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -677,6 +677,8 @@ static void test_filename(void) test=filename_tests; while (test->basename) { + BOOL quotedfile = FALSE; + sprintf(filename, test->basename, tmpdir); if (strchr(filename, '/')) { @@ -695,6 +697,8 @@ static void test_filename(void) else { char quoted[MAX_PATH + 2]; + + quotedfile = TRUE; sprintf(quoted, ""%s"", filename); rc=shell_execute(test->verb, quoted, NULL, NULL); } @@ -702,7 +706,9 @@ static void test_filename(void) rc=33; if ((test->todo & 0x1)==0) { - ok(rc==test->rc, "%s failed: rc=%d err=%d\n", shell_call, + ok(rc==test->rc || + broken(quotedfile && rc == 2), /* NT4 */ + "%s failed: rc=%d err=%d\n", shell_call, rc, GetLastError()); } else todo_wine