From 55e8f7ae69bd62c90c525538373e423dc9d6d11b Mon Sep 17 00:00:00 2001 From: Mike Nordell Date: Fri, 31 Aug 2012 14:16:17 +0000 Subject: [PATCH] Stop erroneous reporting of SEGV from test case. MS own CRT SEGV on NULL format string svn path=/trunk/; revision=57207 --- rostests/apitests/crt/_vscprintf.c | 5 ++--- rostests/apitests/crt/_vscwprintf.c | 8 ++------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/rostests/apitests/crt/_vscprintf.c b/rostests/apitests/crt/_vscprintf.c index 1a72bd689e1..7396995dce9 100644 --- a/rostests/apitests/crt/_vscprintf.c +++ b/rostests/apitests/crt/_vscprintf.c @@ -25,7 +25,6 @@ START_TEST(_vscprintf) call_varargs(12, "%S world!", L"hello"); call_varargs(12, "%s world!", "hello"); call_varargs(11, "%u cookies", 100); - /* Test NULL argument */ - call_varargs(-1, NULL); - ok(errno == EINVAL, "Expected EINVAL, got %u\n", errno); + /* Do not test NULL argument. That is verified to SEGV on a */ + /* release-build with VC10 and MS' msvcrt. */ } diff --git a/rostests/apitests/crt/_vscwprintf.c b/rostests/apitests/crt/_vscwprintf.c index d2390b7876c..567fbf0d8d5 100644 --- a/rostests/apitests/crt/_vscwprintf.c +++ b/rostests/apitests/crt/_vscwprintf.c @@ -25,10 +25,6 @@ START_TEST(_vscwprintf) call_varargs(19, L"%s world!", "hello"); call_varargs(12, L"%s world!", L"hello"); call_varargs(17, L"Jack ate %u pies", 100); - - /* Test NULL argument */ - call_varargs(-1, NULL); -#if defined(TEST_MSVCRT) /* NTDLL doesn't use/set errno */ - ok(errno == EINVAL, "Expected EINVAL, got %u\n", errno); -#endif + /* Do not test NULL argument. That is verified to SEGV on a */ + /* release-build with VC10 and MS' msvcrt. */ }