commit 23a0ebd4c6bf35374ae232afd04cf38429221020
author Hui Yingst <nigi@chromium.org> Fri Oct 09 06:15:50 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri Oct 09 06:15:50 2020 +0000
tree 50dae5743f8fea5c3b7b318417e735499e661330
parent 57daee8ec531fa870addf4e886e1471afb9512c1

Disable some Windows-only embedder tests which fail with Skia/SkiaPaths.

To enable embedder tests on bots with Skia/SkiaPaths enabled, the
embedder tests which are currently failing for these configurations
need to be disabled first.

Bug: pdfium:11
Change-Id: I63bb8a60420ff8e8fd3b5d8da406b621bfa43a43
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/74731
Commit-Queue: Hui Yingst <nigi@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>

fpdfsdk/fpdf_view_embeddertest.cpp

diff --git a/fpdfsdk/fpdf_view_embeddertest.cpp b/fpdfsdk/fpdf_view_embeddertest.cpp
index d0ae4c2..4e52863 100644
--- a/fpdfsdk/fpdf_view_embeddertest.cpp
+++ b/fpdfsdk/fpdf_view_embeddertest.cpp
@@ -1238,7 +1238,7 @@
   }
 }
 
-// TODO(crbug.com/pdfium/11): Fix this test and enable.
+// TODO(crbug.com/pdfium/1500): Fix this test and enable.
 #if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
 #define MAYBE_RenderBug664284WithNoNativeText \
   DISABLED_RenderBug664284WithNoNativeText
@@ -1419,7 +1419,13 @@
 }
 
 #if defined(OS_WIN)
-TEST_F(FPDFViewEmbedderTest, FPDFRenderPageEmf) {
+// TODO(crbug.com/pdfium/1500): Fix this test and enable.
+#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+#define MAYBE_FPDFRenderPageEmf DISABLED_FPDFRenderPageEmf
+#else
+#define MAYBE_FPDFRenderPageEmf FPDFRenderPageEmf
+#endif
+TEST_F(FPDFViewEmbedderTest, MAYBE_FPDFRenderPageEmf) {
   ASSERT_TRUE(OpenDocument("rectangles.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -1472,7 +1478,13 @@
   }
 };
 
-TEST_F(PostScriptLevel2EmbedderTest, Rectangles) {
+// TODO(crbug.com/pdfium/1500): Fix this test and enable.
+#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+#define MAYBE_Rectangles DISABLED_Rectangles
+#else
+#define MAYBE_Rectangles Rectangles
+#endif
+TEST_F(PostScriptLevel2EmbedderTest, MAYBE_Rectangles) {
   ASSERT_TRUE(OpenDocument("rectangles.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -1489,7 +1501,13 @@
   UnloadPage(page);
 }
 
-TEST_F(PostScriptLevel3EmbedderTest, Rectangles) {
+// TODO(crbug.com/pdfium/1500): Fix this test and enable.
+#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+#define MAYBE_Rectangles DISABLED_Rectangles
+#else
+#define MAYBE_Rectangles Rectangles
+#endif
+TEST_F(PostScriptLevel3EmbedderTest, MAYBE_Rectangles) {
   ASSERT_TRUE(OpenDocument("rectangles.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);
@@ -1506,7 +1524,13 @@
   UnloadPage(page);
 }
 
-TEST_F(PostScriptLevel2EmbedderTest, Image) {
+// TODO(crbug.com/pdfium/1500): Fix this test and enable.
+#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+#define MAYBE_Image DISABLED_Image
+#else
+#define MAYBE_Image Image
+#endif
+TEST_F(PostScriptLevel2EmbedderTest, MAYBE_Image) {
   const char kExpected[] =
       "\n"
       "save\n"
@@ -1579,7 +1603,13 @@
   UnloadPage(page);
 }
 
-TEST_F(PostScriptLevel3EmbedderTest, Image) {
+// TODO(crbug.com/pdfium/1500): Fix this test and enable.
+#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+#define MAYBE_Image DISABLED_Image
+#else
+#define MAYBE_Image Image
+#endif
+TEST_F(PostScriptLevel3EmbedderTest, MAYBE_Image) {
   const char kExpected[] = R"(
 save
 /im/initmatrix load def
@@ -1623,7 +1653,13 @@
   UnloadPage(page);
 }
 
-TEST_F(FPDFViewEmbedderTest, ImageMask) {
+// TODO(crbug.com/pdfium/1500): Fix this test and enable.
+#if defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
+#define MAYBE_ImageMask DISABLED_ImageMask
+#else
+#define MAYBE_ImageMask ImageMask
+#endif
+TEST_F(FPDFViewEmbedderTest, MAYBE_ImageMask) {
   ASSERT_TRUE(OpenDocument("bug_674771.pdf"));
   FPDF_PAGE page = LoadPage(0);
   ASSERT_TRUE(page);