Paul Vriens : oleaut32/tests: Skip VarCat tests if there is no I8 and/
or UI8 support.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Aug 20 07:42:35 CDT 2007
Module: wine
Branch: master
Commit: c36acfce381e68bd6c263fde48e475661987a4cf
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c36acfce381e68bd6c263fde48e475661987a4cf
Author: Paul Vriens <paul.vriens.wine at gmail.com>
Date: Fri Aug 17 15:48:22 2007 +0200
oleaut32/tests: Skip VarCat tests if there is no I8 and/or UI8 support.
---
dlls/oleaut32/tests/vartest.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c
index be96f25..756c477 100644
--- a/dlls/oleaut32/tests/vartest.c
+++ b/dlls/oleaut32/tests/vartest.c
@@ -102,6 +102,9 @@ static void init(void)
#define HAVE_FUNC(func) ((void*)GetProcAddress(hOleaut32, #func) != NULL)
HAVE_OLEAUT32_I8 = HAVE_FUNC(VarI8FromI1);
+ if (!HAVE_OLEAUT32_I8)
+ skip("No support for I8 and UI8 data types\n");
+
HAVE_OLEAUT32_RECORD = HAVE_FUNC(SafeArraySetRecordInfo);
IS_ANCIENT = (!HAVE_FUNC(VarI1FromI2));
@@ -5150,6 +5153,12 @@ static void test_VarCat(void)
leftvt == 15 || rightvt == 15 /* Undefined type */)
continue;
+ /* Check if we need/have support for I8 and/or UI8 */
+ if ((leftvt == VT_I8 || leftvt == VT_UI8 ||
+ rightvt == VT_I8 || rightvt == VT_UI8) &&
+ !HAVE_OLEAUT32_I8)
+ continue;
+
if (leftvt == VT_NULL && rightvt == VT_NULL)
resultvt = VT_NULL;
else if (leftvt == VT_VARIANT && (rightvt == VT_ERROR ||
More information about the wine-cvs
mailing list