Repository.mk | 1 +
config_host.mk.in | 1 +
configure.ac | 19 +++++++++++++++++++
distro-configs/LibreOfficeOssFuzz.conf | 1 +
vcl/Module_vcl.mk | 6 ++++++
vcl/source/filter/wmf/winmtf.cxx | 2 +-
6 files changed, 29 insertions(+), 1 deletion(-)
New commits:
commit 5ca4a50c17e9637c8b39293ec1d1c50402b563f7
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Dec 5 12:10:47 2016 +0000
optionally enable oss-fuzz targets via --enable-fuzzers
Change-Id: I16f52515a149a1e6e47cd0301a45db84ddd95885
diff --git a/Repository.mk b/Repository.mk
index 5f42a92..af23d5b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -93,6 +93,7 @@ $(eval $(call
gb_Helper_register_executables_for_install,SDK,sdk, \
$(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \
$(call gb_Helper_optional,BREAKPAD,minidump_upload) \
+ $(call gb_Helper_optional,FUZZERS,wmftester) \
$(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \
soffice_bin \
$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \
diff --git a/config_host.mk.in b/config_host.mk.in
index 9181748..9538582 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -121,6 +121,7 @@ export ENABLE_COLLADA=@ENABLE_COLLADA@
export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@
export ENABLE_CUPS=@ENABLE_CUPS@
export ENABLE_CURL=@ENABLE_CURL@
+export ENABLE_FUZZERS=@ENABLE_FUZZERS@
export ENABLE_DBGUTIL=@ENABLE_DBGUTIL@
export ENABLE_DBUS=@ENABLE_DBUS@
export ENABLE_DCONF=@ENABLE_DCONF@
diff --git a/configure.ac b/configure.ac
index ba2b359..f26c867 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1049,6 +1049,11 @@ AC_ARG_ENABLE(fetch-external,
[Disables fetching external tarballs from web sources.])
)
+AC_ARG_ENABLE(fuzzers,
+ AS_HELP_STRING([--enable-fuzzers],
+ [Enables building libfuzzer targets for fuzz testing.])
+)
+
AC_ARG_ENABLE(pch,
AS_HELP_STRING([--enable-pch],
[Enables precompiled header support for C++. Forced default on
Windows/VC build])
@@ -9206,6 +9211,20 @@ else
fi
AC_SUBST(ENABLE_BREAKPAD)
+dnl ==================================================================
+dnl libfuzzer
+dnl ==================================================================
+AC_MSG_CHECKING([whether to enable fuzzers])
+if test "$enable_fuzzers" != yes; then
+ AC_MSG_RESULT([no])
+else
+ AC_MSG_RESULT([yes])
+ ENABLE_FUZZERS="TRUE"
+ AC_DEFINE(ENABLE_FUZZERS)
+ BUILD_TYPE="$BUILD_TYPE FUZZERS"
+fi
+AC_SUBST(ENABLE_FUZZERS)
+
dnl ===================================================================
dnl Orcus
dnl ===================================================================
diff --git a/distro-configs/LibreOfficeOssFuzz.conf
b/distro-configs/LibreOfficeOssFuzz.conf
index e556f37..8ca2447 100644
--- a/distro-configs/LibreOfficeOssFuzz.conf
+++ b/distro-configs/LibreOfficeOssFuzz.conf
@@ -1,3 +1,4 @@
+--enable-fuzzers
--disable-postgresql-sdbc
--disable-firebird-sdbc
--disable-coinmp
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 767d5f7..7123e41 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -95,6 +95,12 @@ $(eval $(call gb_Module_add_targets,vcl,\
))
endif
+ifneq ($(ENABLE_FUZZERS),)
+$(eval $(call gb_Module_add_targets,vcl,\
+ Executable_wmftester \
+))
+endif
+
$(eval $(call gb_Module_add_check_targets,vcl,\
CppunitTest_vcl_lifecycle \
CppunitTest_vcl_bitmap_test \
commit 32bdcdd411178a909806905bdee8725e3492dc7f
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Dec 5 12:56:22 2016 +0000
fix build
Change-Id: I45c180d5eed1bcac97674ce39ae07b9a47819aa4
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index fc4bd6e..1c66a1b 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -151,7 +151,7 @@ namespace {
OUString getLODefaultLanguage()
{
if (utl::ConfigManager::IsAvoidConfig())
- return "en-US";
+ return OUString("en-US");
OUString
result(officecfg::Office::Linguistic::General::DefaultLocale::get());
if (result.isEmpty())
result = officecfg::Setup::L10N::ooSetupSystemLocale::get();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
