Paul Vriens : oleaut32/tests:
Skip VarCat and VarAnd tests a bit better if there is no I8 and/
or UI8 support.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Aug 20 16:09:02 CDT 2007
Module: wine
Branch: master
Commit: 99ebe8b428a18692781955036c68829dd8d9b816
URL: http://source.winehq.org/git/wine.git/?a=commit;h=99ebe8b428a18692781955036c68829dd8d9b816
Author: Paul Vriens <paul.vriens.wine at gmail.com>
Date: Mon Aug 20 16:58:59 2007 +0200
oleaut32/tests: Skip VarCat and VarAnd tests a bit better if there is no I8 and/or UI8 support.
---
dlls/oleaut32/tests/vartest.c | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c
index e55ecf4..5ec765b 100644
--- a/dlls/oleaut32/tests/vartest.c
+++ b/dlls/oleaut32/tests/vartest.c
@@ -5140,6 +5140,10 @@ static void test_VarCat(void)
SKIPTESTS(leftvt);
+ /* Check if we need/have support for I8 and/or UI8 */
+ if ((leftvt == VT_I8 || leftvt == VT_UI8) && !HAVE_OLEAUT32_I8)
+ continue;
+
for (rightvt = 0; rightvt <= VT_BSTR_BLOB; rightvt++)
{
@@ -5154,9 +5158,7 @@ static void test_VarCat(void)
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)
+ if ((rightvt == VT_I8 || rightvt == VT_UI8) && !HAVE_OLEAUT32_I8)
continue;
if (leftvt == VT_NULL && rightvt == VT_NULL)
@@ -5465,15 +5467,17 @@ static void test_VarAnd(void)
{
SKIPTESTAND(leftvt);
+ /* Check if we need/have support for I8 and/or UI8 */
+ if ((leftvt == VT_I8 || leftvt == VT_UI8) && !HAVE_OLEAUT32_I8)
+ continue;
+
for (rightvt = 0; rightvt <= VT_BSTR_BLOB; rightvt++)
{
BOOL bFail = FALSE;
SKIPTESTAND(rightvt);
/* 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)
+ if ((rightvt == VT_I8 || rightvt == VT_UI8) && !HAVE_OLEAUT32_I8)
continue;
memset(&left, 0, sizeof(left));
More information about the wine-cvs
mailing list