[Libreoffice-commits] core.git: vcl/CppunitTest_vcl_graphic_test.mk vcl/qa

[Miklos Vajna (via logerrit)]

 vcl/CppunitTest_vcl_graphic_test.mk        |    2 +-
 vcl/qa/cppunit/VectorGraphicSearchTest.cxx |    4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit a4836c01a94454ae52aa97b29a7ec26fb26aa03c
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Tue Apr 13 20:44:50 2021 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Wed Apr 14 08:19:23 2021 +0200

    vcl VectorGraphicSearchTest: avoid HAVE_FEATURE_PDFIUM ifdef
    
    This is entirely specific to pdfium, so don't build it in the no-pdfium
    case.
    
    Towards completely avoiding the HAVE_FEATURE_PDFIUM ifdef forest.
    
    Change-Id: I127fce64d4ba1fffe529daf927311ed4d42d745f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114067
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/vcl/CppunitTest_vcl_graphic_test.mk b/vcl/CppunitTest_vcl_graphic_test.mk
index 901714eb820f..6089512f5b5b 100644
--- a/vcl/CppunitTest_vcl_graphic_test.mk
+++ b/vcl/CppunitTest_vcl_graphic_test.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,vcl_graphic_test, \
     vcl/qa/cppunit/GraphicDescriptorTest \
     vcl/qa/cppunit/GraphicFormatDetectorTest \
     vcl/qa/cppunit/GraphicNativeMetadataTest \
-    vcl/qa/cppunit/VectorGraphicSearchTest \
+    $(if $(filter PDFIUM,$(BUILD_TYPE)),vcl/qa/cppunit/VectorGraphicSearchTest) \
     vcl/qa/cppunit/BinaryDataContainerTest \
 ))
 
diff --git a/vcl/qa/cppunit/VectorGraphicSearchTest.cxx b/vcl/qa/cppunit/VectorGraphicSearchTest.cxx
index e539c5a81636..684493e9cd0c 100644
--- a/vcl/qa/cppunit/VectorGraphicSearchTest.cxx
+++ b/vcl/qa/cppunit/VectorGraphicSearchTest.cxx
@@ -9,8 +9,6 @@
 
 #include <config_features.h>
 
-#if HAVE_FEATURE_PDFIUM
-
 #include <string_view>
 
 #include <cppunit/TestAssert.h>
@@ -287,6 +285,4 @@ void VectorGraphicSearchTest::testSearchMatchCase()
 
 CPPUNIT_TEST_SUITE_REGISTRATION(VectorGraphicSearchTest);
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */