Dmitry Timoshkov : schedsvc/tests: Avoid test failures on file systems with enabled directory randomization.
Alexandre Julliard
julliard at winehq.org
Tue Apr 8 14:02:50 CDT 2014
Module: wine
Branch: master
Commit: 96760c3b51857cb30cd7d4a6faa9607740d5dde2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=96760c3b51857cb30cd7d4a6faa9607740d5dde2
Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date: Tue Apr 8 15:49:11 2014 +0900
schedsvc/tests: Avoid test failures on file systems with enabled directory randomization.
---
dlls/schedsvc/tests/rpcapi.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c
index 6c555c8..2ef50c9 100644
--- a/dlls/schedsvc/tests/rpcapi.c
+++ b/dlls/schedsvc/tests/rpcapi.c
@@ -405,7 +405,9 @@ START_TEST(rpcapi)
ok(count == 1, "expected 1, got %u\n", count);
ok(start_index == 1, "expected 1, got %u\n", start_index);
ok(names != NULL, "names should not be NULL\n");
- ok(!lstrcmpW(names[0], Task1), "expected Task1, got %s\n", wine_dbgstr_w(names[0]));
+ /* returned name depends whether directory randomization is on */
+ ok(!lstrcmpW(names[0], Task1) || !lstrcmpW(names[0], Task2),
+ "expected Task3, got %s\n", wine_dbgstr_w(names[0]));
MIDL_user_free(names[0]);
MIDL_user_free(names);
@@ -465,7 +467,9 @@ START_TEST(rpcapi)
ok(count == 1, "expected 1, got %u\n", count);
ok(start_index == 3, "expected 3, got %u\n", start_index);
ok(names != NULL, "names should not be NULL\n");
- ok(!lstrcmpW(names[0], Task3), "expected Task3, got %s\n", wine_dbgstr_w(names[0]));
+ /* returned name depends whether directory randomization is on */
+ ok(!lstrcmpW(names[0], Task1) || !lstrcmpW(names[0], Task2) || !lstrcmpW(names[0], Task3),
+ "expected Task3, got %s\n", wine_dbgstr_w(names[0]));
MIDL_user_free(names[0]);
MIDL_user_free(names);
More information about the wine-cvs
mailing list