Module: wine Branch: master Commit: 3b072fb772a1cde59d576b163c58dd18094bce3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b072fb772a1cde59d576b163c...
Author: Francois Gouget fgouget@free.fr Date: Mon Feb 23 10:41:51 2009 +0100
oleaut32/tests: Use win_skip() to skip over unimplemented functionality.
---
dlls/oleaut32/tests/olefont.c | 2 +- dlls/oleaut32/tests/olepicture.c | 4 ++-- dlls/oleaut32/tests/varformat.c | 2 +- dlls/oleaut32/tests/vartype.c | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index cce1777..8e26a0f 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -808,7 +808,7 @@ START_TEST(olefont) pOleCreateFontIndirect = (void*)GetProcAddress(hOleaut32, "OleCreateFontIndirect"); if (!pOleCreateFontIndirect) { - skip("OleCreateFontIndirect not available\n"); + win_skip("OleCreateFontIndirect not available\n"); return; }
diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 1130410..2dc1b05 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -477,7 +477,7 @@ static void test_OleCreatePictureIndirect(void)
if(!pOleCreatePictureIndirect) { - skip("Skipping OleCreatePictureIndirect tests\n"); + win_skip("Skipping OleCreatePictureIndirect tests\n"); return; }
@@ -707,7 +707,7 @@ START_TEST(olepicture) pOleCreatePictureIndirect = (void*)GetProcAddress(hOleaut32, "OleCreatePictureIndirect"); if (!pOleLoadPicture) { - skip("OleLoadPicture is not available\n"); + win_skip("OleLoadPicture is not available\n"); return; }
diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 738c306..b19efbd 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -449,7 +449,7 @@ static void test_VarWeekdayName(void) GetLocaleInfoW(LOCALE_USER_DEFAULT, 0, NULL, 0); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - skip("GetLocaleInfoW is not implemented\n"); + win_skip("GetLocaleInfoW is not implemented\n"); return; }
diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 4f28234..eba0bc1 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -46,7 +46,7 @@ static HMODULE hOleaut32; /* Get a conversion function ptr, return if function not available */ #define CHECKPTR(func) p##func = (void*)GetProcAddress(hOleaut32, #func); \ if (!p##func) { \ - skip("function " # func " not available, not testing it\n"); return; } + win_skip("function " # func " not available, not testing it\n"); return; }
/* Is a given function exported from oleaut32? */ #define HAVE_FUNC(func) ((void*)GetProcAddress(hOleaut32, #func) != NULL) @@ -2349,7 +2349,7 @@ static void test_VarI8Copy(void)
if (!HAVE_OLEAUT32_I8) { - skip("I8 and UI8 data types are not available\n"); + win_skip("I8 and UI8 data types are not available\n"); return; }
@@ -2379,7 +2379,7 @@ static void test_VarI8ChangeTypeEx(void)
if (!HAVE_OLEAUT32_I8) { - skip("I8 and UI8 data types are not available\n"); + win_skip("I8 and UI8 data types are not available\n"); return; }
@@ -2611,7 +2611,7 @@ static void test_VarUI8Copy(void)
if (!HAVE_OLEAUT32_I8) { - skip("I8 and UI8 data types are not available\n"); + win_skip("I8 and UI8 data types are not available\n"); return; }
@@ -2641,7 +2641,7 @@ static void test_VarUI8ChangeTypeEx(void)
if (!HAVE_OLEAUT32_I8) { - skip("I8 and UI8 data types are not available\n"); + win_skip("I8 and UI8 data types are not available\n"); return; }