summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthestig <thestig@chromium.org>2016-06-29 06:47:46 -0700
committerCommit bot <commit-bot@chromium.org>2016-06-29 06:47:46 -0700
commit0efab9428fe9fe0a1af4f8eba9fabb78b1eee44a (patch)
tree9e4af7aa843c8d7ead05aadd7d3fd64d63a65719
parent017052a077d8f900e3098b8f9115078a037ee805 (diff)
downloadpdfium-0efab9428fe9fe0a1af4f8eba9fabb78b1eee44a.tar.xz
Disable failing embedder tests for Skia builds.
BUG=pdfium:525,pdfium:526 Review-Url: https://codereview.chromium.org/2106043002
-rw-r--r--core/fpdfapi/fpdf_render/fpdf_render_loadimage_embeddertest.cpp7
-rw-r--r--core/fpdfapi/fpdf_render/fpdf_render_pattern_embeddertest.cpp7
2 files changed, 12 insertions, 2 deletions
diff --git a/core/fpdfapi/fpdf_render/fpdf_render_loadimage_embeddertest.cpp b/core/fpdfapi/fpdf_render/fpdf_render_loadimage_embeddertest.cpp
index 5c6a8c513f..bbaf7b389d 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render_loadimage_embeddertest.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_loadimage_embeddertest.cpp
@@ -7,7 +7,12 @@
class FPDFRenderLoadImageEmbeddertest : public EmbedderTest {};
-TEST_F(FPDFRenderLoadImageEmbeddertest, Bug_554151) {
+#if defined(_SKIA_SUPPORT_)
+#define MAYBE_Bug_554151 DISABLED_Bug_554151
+#else
+#define MAYBE_Bug_554151 Bug_554151
+#endif
+TEST_F(FPDFRenderLoadImageEmbeddertest, MAYBE_Bug_554151) {
// Test scanline downsampling with a BitsPerComponent of 4.
// Should not crash.
EXPECT_TRUE(OpenDocument("bug_554151.pdf"));
diff --git a/core/fpdfapi/fpdf_render/fpdf_render_pattern_embeddertest.cpp b/core/fpdfapi/fpdf_render/fpdf_render_pattern_embeddertest.cpp
index 176c923372..48fe352fe7 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render_pattern_embeddertest.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_pattern_embeddertest.cpp
@@ -7,7 +7,12 @@
class FPDFRenderPatternEmbeddertest : public EmbedderTest {};
-TEST_F(FPDFRenderPatternEmbeddertest, LoadError_547706) {
+#if defined(_SKIA_SUPPORT_)
+#define MAYBE_LoadError_547706 DISABLED_LoadError_547706
+#else
+#define MAYBE_LoadError_547706 LoadError_547706
+#endif
+TEST_F(FPDFRenderPatternEmbeddertest, MAYBE_LoadError_547706) {
// Test shading where object is a dictionary instead of a stream.
EXPECT_TRUE(OpenDocument("bug_547706.pdf"));
FPDF_PAGE page = LoadPage(0);