[PATCH] gdiplus/tests: Don't fail if fonts are missing

Alex Henrie alexhenrie24 at gmail.com
Mon Sep 3 23:27:47 CDT 2018


Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
---
This should fix the test failures on Debian.
---
 dlls/gdiplus/tests/font.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c
index 961d8459cb..bbddcce345 100644
--- a/dlls/gdiplus/tests/font.c
+++ b/dlls/gdiplus/tests/font.c
@@ -430,28 +430,34 @@ static void test_getgenerics (void)
     int missingfonts = 0;
 
     stat = GdipGetGenericFontFamilySansSerif(&family);
-    expect (Ok, stat);
     if (stat == FontFamilyNotFound)
         missingfonts = 1;
     else
+    {
+        expect(Ok, stat);
         check_family("Sans Serif", family, sansname);
+    }
 
     stat = GdipGetGenericFontFamilySerif(&family);
-    expect (Ok, stat);
     if (stat == FontFamilyNotFound)
         missingfonts = 1;
     else
+    {
+        expect(Ok, stat);
         check_family("Serif", family, serifname);
+    }
 
     stat = GdipGetGenericFontFamilyMonospace(&family);
-    expect (Ok, stat);
     if (stat == FontFamilyNotFound)
         missingfonts = 1;
     else
+    {
+        expect(Ok, stat);
         check_family("Monospace", family, mononame);
+    }
 
-    if (missingfonts && strcmp(winetest_platform, "wine") == 0)
-        trace("You may need to install either the Microsoft Web Fonts or the Liberation Fonts\n");
+    if (missingfonts)
+        skip("You may need to install either the Microsoft Web Fonts or the Liberation Fonts\n");
 
     /* Check that the family names are all different */
     ok(lstrcmpiW(sansname, serifname) != 0, "Sans Serif and Serif families should be different: %s\n", wine_dbgstr_w(sansname));
-- 
2.18.0




More information about the wine-devel mailing list