Commit c36acfce authored by Paul Vriens's avatar Paul Vriens Committed by Alexandre Julliard

oleaut32/tests: Skip VarCat tests if there is no I8 and/or UI8 support.

parent 9226cee6
......@@ -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 ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment