Nikolay Sivov : msvcrt/tests: Fix a test failure on early XP versions.

Alexandre Julliard julliard at wine.codeweavers.com
Mon May 16 10:36:45 CDT 2016


Module: wine
Branch: master
Commit: 1b072058acae2398e190b8eb90ec4e7c6fe52825
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1b072058acae2398e190b8eb90ec4e7c6fe52825

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Sat May  7 09:51:21 2016 +0300

msvcrt/tests: Fix a test failure on early XP versions.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/msvcrt/tests/heap.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/msvcrt/tests/heap.c b/dlls/msvcrt/tests/heap.c
index 82a5961..3d75cf1 100644
--- a/dlls/msvcrt/tests/heap.c
+++ b/dlls/msvcrt/tests/heap.c
@@ -474,8 +474,9 @@ static void test_calloc(void)
 
     errno = 0;
     ptr = calloc(~(size_t)0 / 2, ~(size_t)0 / 2);
-    ok(ptr == NULL, "got %p\n", ptr);
+    ok(ptr == NULL || broken(ptr != NULL) /* winxp sp0 */, "got %p\n", ptr);
     ok(errno == ENOMEM || broken(errno == 0) /* winxp, win2k3 */, "got errno %d\n", errno);
+    free(ptr);
 }
 
 START_TEST(heap)




More information about the wine-cvs mailing list