user32/tests: Relax iCaptionWidth test to fix some failures.
authorNikolay Sivov <nsivov@codeweavers.com>
Thu, 19 Nov 2015 14:32:31 +0000 (17:32 +0300)
committerAlexandre Julliard <julliard@winehq.org>
Fri, 20 Nov 2015 03:25:44 +0000 (12:25 +0900)
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
dlls/user32/tests/sysparams.c

index 1ee89204e53916e4c4897607b95c6b57fbfc0c72..6fc24a644184ec113261fa0bc488dd2e698855bc 100644 (file)
@@ -1552,10 +1552,10 @@ static void test_SPI_SETNONCLIENTMETRICS( void )               /*     44 */
     ok( Ncmcur.iSmCaptionHeight == expect,
         "SmCaptionHeight: %d expected %d\n", Ncmcur.iSmCaptionHeight, expect);
 
-    ok( Ncmcur.iCaptionWidth == 8 ||
-        Ncmcur.iCaptionWidth == 12 || /* Vista, W7b */
+    /* iCaptionWidth depends on a version, could be 8, 12 (Vista, Win7), 13 */
+    ok( (Ncmcur.iCaptionWidth >= 8 && Ncmcur.iCaptionWidth <= 13) ||
         Ncmcur.iCaptionWidth == Ncmstart.iCaptionWidth, /* with windows XP theme,  the value never changes */
-        "CaptionWidth: %d expected 8, 12 or %d\n", Ncmcur.iCaptionWidth, Ncmstart.iCaptionWidth);
+        "CaptionWidth: %d expected from [8, 13] or %d\n", Ncmcur.iCaptionWidth, Ncmstart.iCaptionWidth);
     ok( Ncmcur.iScrollWidth == 8,
         "ScrollWidth: %d expected 8\n", Ncmcur.iScrollWidth);
     ok( Ncmcur.iScrollHeight == 8,