configure.ac | 14 --------------
filter/qa/unit/svg.cxx | 3 ++-
2 files changed, 2 insertions(+), 15 deletions(-)
New commits:
commit 6bc66a08b8fef03772979f67a34df4e9cc3ff33d
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sat Mar 9 08:03:08 2024 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Mar 11 11:36:28 2024 +0100
Enable CVE tests on Windows by default
Since commit c16969b9bc73fdd77e763299d6aea7b614e203e2
(tdf#84553 Detect and warn of Windows Antivirus., 2020-02-08),
it is checked that antivirus is disabled in $SRC_ROOT and $BUILDDIR.
This reverts commit a6b2c618cb02168bba950652367f494a1021cf53
(disable cve tests by default on windows, 2014-10-01).
Change-Id: I3816e97cfb4559f7647167ed291b75468b03dc4d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164612
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
(cherry picked from commit 4c65ab909598766e5859a5f0ce4bf55b23c9551b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164621
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/configure.ac b/configure.ac
index 901392b32fcf..51e1e55a404b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11100,20 +11100,6 @@ dnl
===================================================================
dnl Check for disabling cve_tests
dnl ===================================================================
AC_MSG_CHECKING([whether to execute CVE tests])
-# If not explicitly enabled or disabled, default
-if test -z "$enable_cve_tests"; then
- case "$OS" in
- WNT)
- # Default cves off for Windows with its wild and wonderful
- # variety of AV software kicking in and panicking
- enable_cve_tests=no
- ;;
- *)
- # otherwise yes
- enable_cve_tests=yes
- ;;
- esac
-fi
if test "$enable_cve_tests" = "no"; then
AC_MSG_RESULT([no])
DISABLE_CVE_TESTS=TRUE
diff --git a/filter/qa/unit/svg.cxx b/filter/qa/unit/svg.cxx
index 4446fa35cb9b..617213933ff0 100644
--- a/filter/qa/unit/svg.cxx
+++ b/filter/qa/unit/svg.cxx
@@ -46,7 +46,8 @@ void SvgFilterTest::registerNamespaces(xmlXPathContextPtr&
pXmlXpathCtx)
CPPUNIT_TEST_FIXTURE(SvgFilterTest, testPreserveJpg)
{
-#if !defined(MACOSX)
+// On Windows, SVGFilter::filterWriterOrCalc can't get current frame to obtain
selection
+#if !defined(MACOSX) && !defined(_WIN32)
// Load a document with a jpeg image in it.
loadFromFile(u"preserve-jpg.odt");
