Re: comctl32/ipaddress: Skip test on Win95 with common controls 4.70 (try2)

[Paul Vriens]

Nikolay Sivov wrote:
For version 4.0 we are skipping earlier on initialization.
Changelog:
    - try2: use win_skip()
    - Skip test on Win95 with common controls 4.70

From 81645944ef518860de7ddcd1b64fadd11277a915 Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <bungleh...@gmail.com>
Date: Wed, 27 May 2009 15:39:20 +0400
Subject: Skip test on Win95 with common controls 4.70

---
 dlls/comctl32/tests/ipaddress.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/comctl32/tests/ipaddress.c b/dlls/comctl32/tests/ipaddress.c
index d04223c..13af687 100644
--- a/dlls/comctl32/tests/ipaddress.c
+++ b/dlls/comctl32/tests/ipaddress.c
@@ -33,8 +33,6 @@ static HWND create_ipaddress_control (void)
     handle = CreateWindowEx(0, WC_IPADDRESS, NULL,
                            WS_BORDER|WS_VISIBLE, 0, 0, 0, 0,
                            NULL, NULL, NULL, NULL);
-    assert(handle);
-
     return handle;
 }
 
@@ -45,6 +43,12 @@ static void test_get_set_text(void)
     INT r;
 
     hwnd = create_ipaddress_control();
+    ok(hwnd != NULL, "Expected window to be created\n");
+    if (!hwnd)
+    {
+        win_skip("IPAddress control not implemented\n");
+        return;
+    }
 
     /* check text just after creation */
     r = GetWindowText(hwnd, ip, sizeof(ip)/sizeof(CHAR));

I would either get rid of the ok(hwnd ...) altogether or move it after 
the if(). win_skip() means we are ok with a failure on some Windows 
boxes so a test failure just before that doesn't make sense.

--
Cheers,

Paul.