Ge van Geldorp : msvcrt/tests: Add acceptable error codes for W2K8+.

Alexandre Julliard julliard at winehq.org
Wed Sep 2 09:31:25 CDT 2009


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

Author: Ge van Geldorp <ggeldorp at vmware.com>
Date:   Wed Sep  2 12:16:29 2009 +0200

msvcrt/tests: Add acceptable error codes for W2K8+.

---

 dlls/msvcrt/tests/string.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c
index 0999241..5a97bad 100644
--- a/dlls/msvcrt/tests/string.c
+++ b/dlls/msvcrt/tests/string.c
@@ -670,27 +670,28 @@ static void test_strtol(void)
     unsigned long ul;
 
     /* errno is only set in case of error, so reset errno to EBADF to check for errno modification */
+    /* errno is modified on W2K8+ */
     errno = EBADF;
     l = strtol("-1234", &e, 0);
     ok(l==-1234, "wrong value %ld\n", l);
-    ok(errno == EBADF, "wrong errno %d\n", errno);
+    ok(errno == EBADF || broken(errno == 0), "wrong errno %d\n", errno);
     errno = EBADF;
     ul = strtoul("1234", &e, 0);
     ok(ul==1234, "wrong value %lu\n", ul);
-    ok(errno == EBADF, "wrong errno %d\n", errno);
+    ok(errno == EBADF || broken(errno == 0), "wrong errno %d\n", errno);
 
     errno = EBADF;
     l = strtol("2147483647L", &e, 0);
     ok(l==2147483647, "wrong value %ld\n", l);
-    ok(errno == EBADF, "wrong errno %d\n", errno);
+    ok(errno == EBADF || broken(errno == 0), "wrong errno %d\n", errno);
     errno = EBADF;
     l = strtol("-2147483648L", &e, 0);
     ok(l==-2147483647L - 1, "wrong value %ld\n", l);
-    ok(errno == EBADF, "wrong errno %d\n", errno);
+    ok(errno == EBADF || broken(errno == 0), "wrong errno %d\n", errno);
     errno = EBADF;
     ul = strtoul("4294967295UL", &e, 0);
     ok(ul==4294967295ul, "wrong value %lu\n", ul);
-    ok(errno == EBADF, "wrong errno %d\n", errno);
+    ok(errno == EBADF || broken(errno == 0), "wrong errno %d\n", errno);
 
     errno = 0;
     l = strtol("9223372036854775807L", &e, 0);




More information about the wine-cvs mailing list