[Bug 132584] Building cppunit with/for Visual Studio 2017/2019

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=132584

--- Comment #2 from Sergey  ---
Hello everyone, if you are also a betting enthusiast I would recommend you to
check out the review on https://melbetlk.com/ I am new to this and thanks to
this review registration was surprisingly quick and easy. There were no
unnecessary hoops to jump through - just a seamless process that had me up and
running in no time. Melbetlk understands that my time is valuable, and they
ensured that signing up was a breeze, allowing me to focus on what matters most
- the thrill of the game. I highly recommend everyone to check out this review

-- 
You are receiving this mail because:
You are the assignee for the bug.

core.git: 2 commits - external/cppunit

[Caolán McNamara (via logerrit)]

 external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1 |  127 
++
 1 file changed, 127 insertions(+)

New commits:
commit 36a1484f72e4da7211349d20f9b3c78e311df9f6
Author: Caolán McNamara 
AuthorDate: Sat Jan 6 19:42:08 2024 +
Commit: Caolán McNamara 
CommitDate: Sat Jan 6 21:52:26 2024 +0100

cid#1546421 COPY_INSTEAD_OF_MOVE

Change-Id: Ifab2f2f5ec8c7f41cd705e0fb07d1273a34b879d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161724
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1 
b/external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1
index 2ca04d5ebb6e..742dce907bcc 100644
--- a/external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1
+++ b/external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1
@@ -44,6 +44,65 @@ index 585c3da..be02385 100644
, m_content()
, m_attributes()
, m_elements()
+@@ -74,15 +74,15 @@ XmlElement::setContent( int numericContent )
+ 
+ 
+ void 
+-XmlElement::addAttribute( std::string attributeName,
+-  std::string value  )
++XmlElement::addAttribute( const std::string& attributeName,
++  const std::string& value  )
+ {
+   m_attributes.push_back( Attribute( attributeName, value ) );
+ }
+ 
+ 
+ void 
+-XmlElement::addAttribute( std::string attributeName,
++XmlElement::addAttribute( const std::string& attributeName,
+   int numericValue )
+ {
+   addAttribute( attributeName, StringTools::toString( numericValue ) );
+@@ -194,7 +194,7 @@ XmlElement::attributesAsString() const
+ 
+ 
+ std::string 
+-XmlElement::escape( std::string value ) const
++XmlElement::escape( const std::string& value ) const
+ {
+   std::string escaped;
+   for ( unsigned int index =0; index < value.length(); ++index )
+diff --git a/include/cppunit/tools/XmlElement.h 
b/include/cppunit/tools/XmlElement.h
+index 3478a35..d033aa2 100644
+--- a/include/cppunit/tools/XmlElement.h
++++ b/include/cppunit/tools/XmlElement.h
+@@ -79,14 +79,14 @@ public:
+* \param attributeName Name of the attribute. Must not be an empty.
+* \param value Value of the attribute.
+*/
+-  void addAttribute( std::string attributeName,
+- std::string value );
++  void addAttribute( const std::string& attributeName,
++ const std::string& value );
+ 
+   /*! rief Adds an attribute with the specified numeric value.
+* \param attributeName Name of the attribute. Must not be empty.
+* \param numericValue Numeric value of the attribute.
+*/
+-  void addAttribute( std::string attributeName,
++  void addAttribute( const std::string& attributeName,
+  int numericValue );
+ 
+   /*! rief Adds a child element to the element.
+@@ -125,7 +125,7 @@ private:
+   typedef std::pair Attribute;
+ 
+   std::string attributesAsString() const;
+-  std::string escape( std::string value ) const;
++  std::string escape( const std::string& value ) const;
+ 
+ private:
+   std::string m_name;
 diff --git a/include/cppunit/Asserter.h b/include/cppunit/Asserter.h
 index ca65593..2010739 100644
 --- a/include/cppunit/Asserter.h
commit a8b20ca2fe7054e699cf0ff48889e54cee4dd4fd
Author: Caolán McNamara 
AuthorDate: Sat Jan 6 19:27:23 2024 +
Commit: Caolán McNamara 
CommitDate: Sat Jan 6 21:52:18 2024 +0100

cid#1545475 COPY_INSTEAD_OF_MOVE

and

cid#1545626 COPY_INSTEAD_OF_MOVE
cid#1546203 COPY_INSTEAD_OF_MOVE

Change-Id: I98a6c36e77fe633d50fdb1a0f063b2656f852a2a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161718
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1 
b/external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1
index 640d04ad5684..2ca04d5ebb6e 100644
--- a/external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1
+++ b/external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1
@@ -44,5 +44,73 @@ index 585c3da..be02385 100644
, m_content()
, m_attributes()
, m_elements()
+diff --git a/include/cppunit/Asserter.h b/include/cppunit/Asserter.h
+index ca65593..2010739 100644
+--- a/include/cppunit/Asserter.h
 b/include/cppunit/Asserter.h
+@@ -159,11 +159,11 @@
+*  what are the differences between the expected 
and actual value.
+* \param shortDescription Short description for the failure message.
+*/
+-  [[noreturn]] static void CPPUNIT_API failNotEqual( std::string expected, 
+-std::string actual, 
++  [[noreturn]] static void CPPUNIT_API failNotEqual( const std::string& 
expected, 
++const std::string& actual, 
+ const SourceLine ,
+ co

cppunit.git: include/cppunit src/cppunit

[Libreoffice Gerrit user]

 include/cppunit/tools/XmlElement.h |8 
 src/cppunit/XmlElement.cpp |8 
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 2b72f2b3ef94452ae649fc6a44bec049f1acb173
Author: Caolán McNamara 
AuthorDate: Sat Jan 6 19:37:42 2024 +
Commit: Caolán McNamara 
CommitDate: Sat Jan 6 20:42:38 2024 +0100

cid#1546421 COPY_INSTEAD_OF_MOVE

Change-Id: I33787047d5125252204aac78ed876bc102a1ec11
Reviewed-on: https://gerrit.libreoffice.org/c/cppunit/+/161722
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/include/cppunit/tools/XmlElement.h 
b/include/cppunit/tools/XmlElement.h
index 3478a35..d033aa2 100644
--- a/include/cppunit/tools/XmlElement.h
+++ b/include/cppunit/tools/XmlElement.h
@@ -79,14 +79,14 @@ public:
* \param attributeName Name of the attribute. Must not be an empty.
* \param value Value of the attribute.
*/
-  void addAttribute( std::string attributeName,
- std::string value );
+  void addAttribute( const std::string& attributeName,
+ const std::string& value );
 
   /*! rief Adds an attribute with the specified numeric value.
* \param attributeName Name of the attribute. Must not be empty.
* \param numericValue Numeric value of the attribute.
*/
-  void addAttribute( std::string attributeName,
+  void addAttribute( const std::string& attributeName,
  int numericValue );
 
   /*! rief Adds a child element to the element.
@@ -125,7 +125,7 @@ private:
   typedef std::pair Attribute;
 
   std::string attributesAsString() const;
-  std::string escape( std::string value ) const;
+  std::string escape( const std::string& value ) const;
 
 private:
   std::string m_name;
diff --git a/src/cppunit/XmlElement.cpp b/src/cppunit/XmlElement.cpp
index be02385..3a59814 100644
--- a/src/cppunit/XmlElement.cpp
+++ b/src/cppunit/XmlElement.cpp
@@ -74,15 +74,15 @@ XmlElement::setContent( int numericContent )
 
 
 void 
-XmlElement::addAttribute( std::string attributeName,
-  std::string value  )
+XmlElement::addAttribute( const std::string& attributeName,
+  const std::string& value  )
 {
   m_attributes.push_back( Attribute( attributeName, value ) );
 }
 
 
 void 
-XmlElement::addAttribute( std::string attributeName,
+XmlElement::addAttribute( const std::string& attributeName,
   int numericValue )
 {
   addAttribute( attributeName, StringTools::toString( numericValue ) );
@@ -194,7 +194,7 @@ XmlElement::attributesAsString() const
 
 
 std::string 
-XmlElement::escape( std::string value ) const
+XmlElement::escape( const std::string& value ) const
 {
   std::string escaped;
   for ( unsigned int index =0; index < value.length(); ++index )

cppunit.git: include/cppunit src/cppunit

[Libreoffice Gerrit user]

 include/cppunit/Asserter.h |   28 -
 src/cppunit/Asserter.cpp   |   50 ++---
 2 files changed, 39 insertions(+), 39 deletions(-)

New commits:
commit d0bf35d30f0662189f646a5c67d89715b725f12c
Author: Caolán McNamara 
AuthorDate: Sat Jan 6 19:33:23 2024 +
Commit: Caolán McNamara 
CommitDate: Sat Jan 6 20:35:02 2024 +0100

make these similar ones consistent

Change-Id: If1da3c7c255d9db83e2dc6181d283b9d82c147bb
Reviewed-on: https://gerrit.libreoffice.org/c/cppunit/+/161719
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/include/cppunit/Asserter.h b/include/cppunit/Asserter.h
index 2010739..15f5c21 100644
--- a/include/cppunit/Asserter.h
+++ b/include/cppunit/Asserter.h
@@ -53,7 +53,7 @@ struct Asserter
   /*! rief Throws a Exception with the specified message and location.
* \deprecated Use fail( Message, SourceLine ) instead.
*/
-  [[noreturn]] static void CPPUNIT_API fail( std::string message,
+  [[noreturn]] static void CPPUNIT_API fail( const std::string& message,
  const SourceLine  = 
SourceLine() );
 
   /*! rief Throws a Exception with the specified message and location.
@@ -74,7 +74,7 @@ struct Asserter
* \param sourceLine Location of the assertion.
*/
   static void CPPUNIT_API failIf( bool shouldFail,
-  std::string message,
+  const std::string& message,
   const SourceLine  = SourceLine() 
);
 
   /*! rief Returns a expected value string for a message, case equal than
@@ -173,11 +173,11 @@ struct Asserter
*  what are the differences between the expected 
and actual value.
* \param shortDescription Short description for the failure message.
*/
-  [[noreturn]] static void CPPUNIT_API failNotLess( std::string expected,
-std::string actual,
+  [[noreturn]] static void CPPUNIT_API failNotLess( const std::string& 
expected,
+const std::string& actual,
 const SourceLine 
,
 const AdditionalMessage 
 = AdditionalMessage(),
-std::string 
shortDescription = "less assertion failed" );
+const std::string& 
shortDescription = "less assertion failed" );
 
   /*! rief Throws an Exception with the specified message and location.
* \param expected Text describing the expected value.
@@ -187,11 +187,11 @@ struct Asserter
*  what are the differences between the expected 
and actual value.
* \param shortDescription Short description for the failure message.
*/
-  [[noreturn]] static void CPPUNIT_API failNotGreater( std::string expected,
-   std::string actual,
+  [[noreturn]] static void CPPUNIT_API failNotGreater( const std::string& 
expected,
+   const std::string& 
actual,
const SourceLine 
,
const AdditionalMessage 
 = AdditionalMessage(),
-   std::string 
shortDescription = "greater assertion failed" );
+   const std::string& 
shortDescription = "greater assertion failed" );
 
   /*! rief Throws an Exception with the specified message and location.
* \param expected Text describing the expected value.
@@ -201,11 +201,11 @@ struct Asserter
*  what are the differences between the expected 
and actual value.
* \param shortDescription Short description for the failure message.
*/
-  [[noreturn]] static void CPPUNIT_API failNotLessEqual( std::string expected,
- std::string actual,
+  [[noreturn]] static void CPPUNIT_API failNotLessEqual( const std::string& 
expected,
+ const std::string& 
actual,
  const SourceLine 
,
  const 
AdditionalMessage  = AdditionalMessage(),
- std::string 
shortDescription = "less equal assertion failed" );
+ const std::string& 
shortDescription = "less equal assertion failed" );
 
   /*! rief Throws an Exception with the specified mess

cppunit.git: include/cppunit src/cppunit

[Libreoffice Gerrit user]

 include/cppunit/Asserter.h |   12 ++--
 src/cppunit/Asserter.cpp   |   12 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit a60124f6dbca67e01bd09047545a0eb767565383
Author: Caolán McNamara 
AuthorDate: Sat Jan 6 19:21:45 2024 +
Commit: Caolán McNamara 
CommitDate: Sat Jan 6 20:28:52 2024 +0100

cid#1545475 COPY_INSTEAD_OF_MOVE

and

cid#1545626 COPY_INSTEAD_OF_MOVE
cid#1546203 COPY_INSTEAD_OF_MOVE

Change-Id: I9df8f30d1102a9fd5247c9efe44be9e3268277bd
Reviewed-on: https://gerrit.libreoffice.org/c/cppunit/+/161717
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/include/cppunit/Asserter.h b/include/cppunit/Asserter.h
index ca65593..2010739 100644
--- a/include/cppunit/Asserter.h
+++ b/include/cppunit/Asserter.h
@@ -159,11 +159,11 @@ struct Asserter
*  what are the differences between the expected 
and actual value.
* \param shortDescription Short description for the failure message.
*/
-  [[noreturn]] static void CPPUNIT_API failNotEqual( std::string expected,
-std::string actual,
+  [[noreturn]] static void CPPUNIT_API failNotEqual( const std::string& 
expected,
+const std::string& actual,
 const SourceLine ,
 const AdditionalMessage 
 = AdditionalMessage(),
-std::string shortDescription = 
"equality assertion failed" );
+const std::string& shortDescription = 
"equality assertion failed" );
 
   /*! rief Throws an Exception with the specified message and location.
* \param expected Text describing the expected value.
@@ -231,11 +231,11 @@ struct Asserter
* \param shortDescription Short description for the failure message.
*/
   static void CPPUNIT_API failNotEqualIf( bool shouldFail,
-  std::string expected,
-  std::string actual,
+  const std::string& expected,
+  const std::string& actual,
   const SourceLine ,
   const AdditionalMessage 
 = AdditionalMessage(),
-  std::string shortDescription = 
"equality assertion failed" );
+  const std::string& shortDescription 
= "equality assertion failed" );
 
 };
 
diff --git a/src/cppunit/Asserter.cpp b/src/cppunit/Asserter.cpp
index 52f8625..fe2097e 100644
--- a/src/cppunit/Asserter.cpp
+++ b/src/cppunit/Asserter.cpp
@@ -110,11 +110,11 @@ Asserter::makeNotEqualMessage( const std::string 
,
 
 
 void
-Asserter::failNotEqual( std::string expected, 
-std::string actual, 
+Asserter::failNotEqual( const std::string& expected,
+const std::string& actual,
 const SourceLine ,
 const AdditionalMessage ,
-std::string shortDescription )
+const std::string& shortDescription )
 {
   fail( makeMessage( makeExpectedEqual(expected),
  makeActual(actual),
@@ -182,11 +182,11 @@ Asserter::failNotGreaterEqual( std::string expected,
 }
 void
 Asserter::failNotEqualIf( bool shouldFail,
-  std::string expected, 
-  std::string actual, 
+  const std::string& expected,
+  const std::string& actual,
   const SourceLine ,
   const AdditionalMessage ,
-  std::string shortDescription )
+  const std::string& shortDescription )
 {
   if ( shouldFail )
 failNotEqual( expected, actual, sourceLine, additionalMessage, 
shortDescription );

core.git: 2 commits - external/cppunit vcl/source

[Caolán McNamara (via logerrit)]

 external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1 |   27 
+-
 vcl/source/gdi/impgraph.cxx|4 -
 vcl/source/gdi/vectorgraphicdata.cxx   |2 
 3 files changed, 28 insertions(+), 5 deletions(-)

New commits:
commit 6bccf8e409a1722ab6920f60478c97241790be87
Author: Caolán McNamara 
AuthorDate: Mon Jan 1 20:49:44 2024 +
Commit: Caolán McNamara 
CommitDate: Tue Jan 2 00:36:32 2024 +0100

cid#1545235 COPY_INSTEAD_OF_MOVE

and

cid#1545514 COPY_INSTEAD_OF_MOVE
cid#1546000 COPY_INSTEAD_OF_MOVE

std::move looks useful there

Change-Id: Ic3967f283ac4c4f5b8b4797889099af5f2dbb117
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161526
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index ac36d2c72be4..7150aab6b0e6 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -1398,7 +1398,7 @@ void ImpGraphic::updateFromLoadedGraphic(const 
ImpGraphic* pGraphic)
 // Only set the size in case the unloaded and loaded unit matches.
 setPrefSize(aPrefSize);
 }
-maGraphicExternalLink = aLink;
+maGraphicExternalLink = std::move(aLink);
 }
 else
 {
@@ -1683,7 +1683,7 @@ bool ImpGraphic::swapInGraphic(SvStream& rStream)
 
 if (!rStream.GetError())
 {
-maVectorGraphicData = aVectorGraphicDataPtr;
+maVectorGraphicData = 
std::move(aVectorGraphicDataPtr);
 bReturn = true;
 }
 }
diff --git a/vcl/source/gdi/vectorgraphicdata.cxx 
b/vcl/source/gdi/vectorgraphicdata.cxx
index 9d94b171a45f..957d15c13a41 100644
--- a/vcl/source/gdi/vectorgraphicdata.cxx
+++ b/vcl/source/gdi/vectorgraphicdata.cxx
@@ -319,7 +319,7 @@ VectorGraphicData::VectorGraphicData(
 
 if (!rIStm.GetError())
 {
-maDataContainer = aData;
+maDataContainer = std::move(aData);
 }
 }
 }
commit 58d7eabbed200daaf8b6e1fcb82687ce70184412
Author: Caolán McNamara 
AuthorDate: Mon Jan 1 20:41:51 2024 +
Commit: Caolán McNamara 
CommitDate: Tue Jan 2 00:36:25 2024 +0100

cid#1545836 COPY_INSTEAD_OF_MOVE

Change-Id: Idb754296175f786c7850253749e3b7f968aa87fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161525
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1 
b/external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1
index 3f587e16b0a9..640d04ad5684 100644
--- a/external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1
+++ b/external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1
@@ -19,7 +19,30 @@ index 3b68d58..7b38a34 100644
 +m_name(std::move(name))
  {
  }
- 
+
+diff --git a/src/cppunit/XmlElement.cpp b/src/cppunit/XmlElement.cpp
+index 585c3da..be02385 100644
+--- a/src/cppunit/XmlElement.cpp
 b/src/cppunit/XmlElement.cpp
+@@ -8,8 +8,8 @@ CPPUNIT_NS_BEGIN
+   
+ XmlElement::XmlElement( std::string elementName,
+ std::string content ) 
+-  : m_name( elementName )
+-  , m_content( content )
++  : m_name(std::move(elementName))
++  , m_content(std::move(content))
+   , m_attributes()
+   , m_elements()
+ {
+@@ -18,7 +18,7 @@ XmlElement::XmlElement( std::string elementName,
+ 
+ XmlElement::XmlElement( std::string elementName,
+ int numericContent )
+-  : m_name( elementName )
++  : m_name(std::move(elementName))
+   , m_content()
+   , m_attributes()
+   , m_elements()
 -- 
 2.43.0
-

cppunit.git: src/cppunit

[Libreoffice Gerrit user]

 src/cppunit/XmlElement.cpp |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit bdf2555703132b0d9c9734f173a3f6dbe60aadb9
Author: Caolán McNamara 
AuthorDate: Mon Jan 1 20:37:48 2024 +
Commit: Caolán McNamara 
CommitDate: Mon Jan 1 21:42:58 2024 +0100

cid#1545836 COPY_INSTEAD_OF_MOVE

Change-Id: I7418a44ef949504d6b80408299f23358971521ca
Reviewed-on: https://gerrit.libreoffice.org/c/cppunit/+/161524
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/src/cppunit/XmlElement.cpp b/src/cppunit/XmlElement.cpp
index 585c3da..be02385 100644
--- a/src/cppunit/XmlElement.cpp
+++ b/src/cppunit/XmlElement.cpp
@@ -8,8 +8,8 @@ CPPUNIT_NS_BEGIN
   
 XmlElement::XmlElement( std::string elementName,
 std::string content ) 
-  : m_name( elementName )
-  , m_content( content )
+  : m_name(std::move(elementName))
+  , m_content(std::move(content))
   , m_attributes()
   , m_elements()
 {
@@ -18,7 +18,7 @@ XmlElement::XmlElement( std::string elementName,
 
 XmlElement::XmlElement( std::string elementName,
 int numericContent )
-  : m_name( elementName )
+  : m_name(std::move(elementName))
   , m_content()
   , m_attributes()
   , m_elements()

core.git: external/cppunit

[Caolán McNamara (via logerrit)]

 external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1 |   25 
++
 external/cppunit/UnpackedTarball_cppunit.mk|3 +
 2 files changed, 28 insertions(+)

New commits:
commit 819630ee52ae9e9249bb8e25ca8d97e9b3ce90de
Author: Caolán McNamara 
AuthorDate: Sat Dec 30 20:11:43 2023 +
Commit: Caolán McNamara 
CommitDate: Sat Dec 30 22:12:33 2023 +0100

cid#1546460 COPY_INSTEAD_OF_MOVE

Change-Id: I562eea9548929f11de2a2b68bba09ae3a777ffe3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161456
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1 
b/external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1
new file mode 100644
index ..3f587e16b0a9
--- /dev/null
+++ b/external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1
@@ -0,0 +1,25 @@
+From ae5acc79d5f6e9b6f64cc550d858f41884362025 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= 
+Date: Sat, 30 Dec 2023 20:08:01 +
+Subject: [PATCH] cid#1546460 COPY_INSTEAD_OF_MOVE
+
+---
+ src/cppunit/TestFactoryRegistry.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cppunit/TestFactoryRegistry.cpp 
b/src/cppunit/TestFactoryRegistry.cpp
+index 3b68d58..7b38a34 100644
+--- a/src/cppunit/TestFactoryRegistry.cpp
 b/src/cppunit/TestFactoryRegistry.cpp
+@@ -85,7 +85,7 @@ public:
+ 
+ TestFactoryRegistry::TestFactoryRegistry( std::string name ) :
+ m_factories(),
+-m_name( name )
++m_name(std::move(name))
+ {
+ }
+ 
+-- 
+2.43.0
+
diff --git a/external/cppunit/UnpackedTarball_cppunit.mk 
b/external/cppunit/UnpackedTarball_cppunit.mk
index 99bbea6971d0..7efe5c4f92bf 100644
--- a/external/cppunit/UnpackedTarball_cppunit.mk
+++ b/external/cppunit/UnpackedTarball_cppunit.mk
@@ -23,6 +23,8 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,cppunit))
 # * external/cppunit/clang.patch.0 upstreamed at
 #   <https://gerrit.libreoffice.org/c/cppunit/+/147384> "Don't mis-apply GCC < 
4.6 workaround for
 #   Clang":
+# * external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1 upstreamed 
at
+#   <https://gerrit.libreoffice.org/c/cppunit/+/161455> "cid#1546460 
COPY_INSTEAD_OF_MOVE";
 $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
external/cppunit/windows.patch \
external/cppunit/unix.patch \
@@ -34,6 +36,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
external/cppunit/propagate-exceptions.patch.0 \
external/cppunit/sprintf.patch.0 \
external/cppunit/clang.patch.0 \
+   external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1 \
 ))
 ifeq ($(DISABLE_DYNLOADING),TRUE)
 $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\

cppunit.git: src/cppunit

[Libreoffice Gerrit user]

 src/cppunit/TestFactoryRegistry.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit eadc170d8f5199453b770d9dc9d67141e0c90fdf
Author: Caolán McNamara 
AuthorDate: Sat Dec 30 20:08:01 2023 +
Commit: Caolán McNamara 
CommitDate: Sat Dec 30 21:10:49 2023 +0100

cid#1546460 COPY_INSTEAD_OF_MOVE

Change-Id: Ieca123c99b5c1e38152b9404371c938f3f4f9b79
Reviewed-on: https://gerrit.libreoffice.org/c/cppunit/+/161455
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/src/cppunit/TestFactoryRegistry.cpp 
b/src/cppunit/TestFactoryRegistry.cpp
index 3b68d58..7b38a34 100644
--- a/src/cppunit/TestFactoryRegistry.cpp
+++ b/src/cppunit/TestFactoryRegistry.cpp
@@ -85,7 +85,7 @@ public:
 
 TestFactoryRegistry::TestFactoryRegistry( std::string name ) :
 m_factories(),
-m_name( name )
+m_name(std::move(name))
 {
 }
 

Do a new CppUnit release? [was: Tests failures trying to package LO in Fedora]

[Stephan Bergmann]

On 8/9/23 08:22, Stephan Bergmann wrote:

On 8/8/23 23:42, Tomaž Vajngerl wrote:

I wonder if the testFormulaRefUpdate could also be influenced by a
change in execution order? Might be good to investigate...


In general, note that while most upstream builds here (Jenkins and 
personal developer ones) use the bundled external/cppunit, and thus have 
<https://git.libreoffice.org/cppunit/+/64eaa35c2de99581e522608e841defffb4b2923b%5E%21> "Run tests in deterministic order", many downstream distro builds likely use a version of CppUnit that does not yet carry that change.


Seeing that the latest 
<https://git.libreoffice.org/cppunit/+/refs/tags/cppunit-1.15.1> is from 
2020-08-25, and does not cover the above commit, maybe it is time to 
release a new version of CppUnit.  Are there any plans?

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac external/cppunit

[Christian Lohmaier (via logerrit)]

 configure.ac  |7 ++-
 external/cppunit/enable-win32-debug.patch |4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 8263cac3fb78fa1a43ef4db314696d4a44dcf26e
Author: Christian Lohmaier 
AuthorDate: Tue Nov 29 12:28:20 2022 +0100
Commit: Andras Timar 
CommitDate: Mon Jun 19 20:06:07 2023 +0200

accept Apple's patch utility - pickier than GNU patch, but should be OK

macOS Ventura replaced the patch utility by Apple's version:
patch 2.0-12u11-Apple (as of macOS 13.0.1)

It is picker/less robust when it comes to locating matches, and absolutely
refuses to apply when the hunks are out of order. Only one patch needed
rework in the current codebase (master an 7-4 branch), and being more 
correct
about the locations in the files to be patched is not a bad thing either, so
accept Apple's version of patch (with a warning for now)

Change-Id: I707d00958b814307b13caf9923f1de7f3919442c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143461
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/configure.ac b/configure.ac
index 40987b268ba6..f83a3c7f8f6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11423,7 +11423,12 @@ if test "$_os" = "SunOS" -o "$_os" = "Darwin" -o 
"$_os" = "FreeBSD"; then
 if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 
2>/dev/null; then
 AC_MSG_RESULT([yes])
 else
-AC_MSG_ERROR([no, GNU patch needed. install or specify with 
--with-gnu-patch=/path/to/it])
+if $GNUPATCH --version | grep "2\.0-.*-Apple" >/dev/null 2>/dev/null; 
then
+AC_MSG_RESULT([no, but accepted (Apple patch)])
+add_warning "patch utility is not GNU patch. Apple's patch should 
work OK, but it might experience issues where GNU patch doesn't."
+else
+AC_MSG_ERROR([no, GNU patch needed. install or specify with 
--with-gnu-patch=/path/to/it])
+fi
 fi
 else
 GNUPATCH=$PATCH
diff --git a/external/cppunit/enable-win32-debug.patch 
b/external/cppunit/enable-win32-debug.patch
index dc159ecc51ad..2c7f4f956d2f 100644
--- a/external/cppunit/enable-win32-debug.patch
+++ b/external/cppunit/enable-win32-debug.patch
@@ -1,6 +1,6 @@
 --- misc/cppunit-1.14.0/src/cppunit/cppunit_dll.vcxproj
 +++ misc/build/cppunit-1.14.0/src/cppunit/cppunit_dll.vcxproj
-@@ -107,7 +107,6 @@
+@@ -190,7 +190,6 @@
true
Level3
true
@@ -8,7 +8,7 @@

..\..\include;%(AdditionalIncludeDirectories)

WIN32;NDEBUG;_WINDOWS;_USRDLL;CPPUNIT_BUILD_DLL;%(PreprocessorDefinitions)
.\ReleaseDll\
-@@ -138,6 +137,7 @@
+@@ -222,6 +221,7 @@
  
true
true

[Libreoffice-commits] cppunit.git: include/cppunit

[Libreoffice Gerrit user]

 include/cppunit/TestAssert.h |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e2b0721c33d0df57c6a596b18ae98644575c51f9
Author: Stephan Bergmann 
AuthorDate: Tue Feb 21 11:10:00 2023 +0100
Commit: Markus Mohrhard 
CommitDate: Tue May 9 20:00:18 2023 +0200

Don't mis-apply GCC < 4.6 workaround for Clang

...which happens to define __GNUC__=4, __GNUC_MINOR__=2.  (See also

<https://git.libreoffice.org/core/+/9a23239b710e44754e4a28643420c9ba91552645%5E%21>
"external/cppunit: Don't mis-apply GCC < 4.6 workaround for Clang".  This 
change
requires <https://gerrit.libreoffice.org/c/cppunit/+/147383> "Use snprintf
instead of sprintf" to avoid deprecation warnings on macOS, which had 
originally
been hidden by the mis-applied #pragma.)

Change-Id: I4fcb38a79766238862795ba4019638862e65b041
Reviewed-on: https://gerrit.libreoffice.org/c/cppunit/+/147384
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/include/cppunit/TestAssert.h b/include/cppunit/TestAssert.h
index 19a8ae5..de97f21 100644
--- a/include/cppunit/TestAssert.h
+++ b/include/cppunit/TestAssert.h
@@ -11,7 +11,8 @@
 
 // Work around "passing 'T' chooses 'int' over 'unsigned int'" warnings when T
 // is an enum type:
-#if defined __GNUC__ && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6))
+#if defined __GNUC__ && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 
6)) \
+&& !defined __clang__
 #pragma GCC system_header
 #endif
 

[Libreoffice-commits] cppunit.git: include/cppunit

[Libreoffice Gerrit user]

 include/cppunit/TestAssert.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5f9aab1993016720db1d7008ed190b0a96293190
Author: Stephan Bergmann 
AuthorDate: Tue Feb 21 10:59:04 2023 +0100
Commit: Markus Mohrhard 
CommitDate: Tue May 9 19:59:41 2023 +0200

Use snprintf instead of sprintf

See

<https://git.libreoffice.org/core/+/bd8a213c8ceccf66ab296ef0aea0fa4c451047e5%5E%21>
"external/cppunit: Use snprintf instead of sprintf" for how sprintf would 
have
caused deprecation warnings on macOS.

(For MSVC, keep using sprintf_s.  According to

<https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/snprintf-snprintf-snprintf-l-snwprintf-snwprintf-l?view=msvc-170>:
"Beginning with the UCRT in Visual Studio 2015 and Windows 10, snprintf is 
no
longer identical to _snprintf.  The snprintf function behavior is now C99
standard conformant."  So for older versions, snprintf would potentially not
store a terminating NUL, like _snprintf but unlike sprintf_s.)

Change-Id: Ibf8b228cd1dd57428ecf85ed10e0793b78ae90c9
Reviewed-on: https://gerrit.libreoffice.org/c/cppunit/+/147383
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/include/cppunit/TestAssert.h b/include/cppunit/TestAssert.h
index 521a4e4..19a8ae5 100644
--- a/include/cppunit/TestAssert.h
+++ b/include/cppunit/TestAssert.h
@@ -112,7 +112,7 @@ struct assertion_traits
 #ifdef __STDC_SECURE_LIB__ // Use secure version with visual studio 2005 to 
avoid warning.
sprintf_s(buffer, sizeof(buffer), "%.*g", precision, x); 
 #else  
-   sprintf(buffer, "%.*g", precision, x); 
+   snprintf(buffer, sizeof(buffer), "%.*g", precision, x); 
 #endif
return buffer;
 }

[Libreoffice-commits] core.git: external/cppunit

[Stephan Bergmann (via logerrit)]

 external/cppunit/UnpackedTarball_cppunit.mk |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit e0228eb8a15127af0bc6eed3b60333265dc4d697
Author: Stephan Bergmann 
AuthorDate: Tue Feb 21 11:18:42 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Feb 21 13:05:50 2023 +

Mark recently added external/cppunit/*.patch.0 as upstreamed

Change-Id: I62c62ee6fbd8ec6bf1846cea305ab97d4e567ae0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147385
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/cppunit/UnpackedTarball_cppunit.mk 
b/external/cppunit/UnpackedTarball_cppunit.mk
index d6304a96762e..99bbea6971d0 100644
--- a/external/cppunit/UnpackedTarball_cppunit.mk
+++ b/external/cppunit/UnpackedTarball_cppunit.mk
@@ -17,7 +17,12 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,cppunit))
 #   "Run tests in deterministic order";
 # * external/cppunit/propagate-exceptions.patch.0 upstreamed at
 #   <https://gerrit.libreoffice.org/c/cppunit/+/144074> "Introduce 
CPPUNIT_PROPAGATE_EXCEPTIONS
-#   environment variable":
+#   environment variable";
+# * external/cppunit/sprintf.patch.0 upstreamed at
+#   <https://gerrit.libreoffice.org/c/cppunit/+/147383> "Use snprintf instead 
of sprintf";
+# * external/cppunit/clang.patch.0 upstreamed at
+#   <https://gerrit.libreoffice.org/c/cppunit/+/147384> "Don't mis-apply GCC < 
4.6 workaround for
+#   Clang":
 $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
external/cppunit/windows.patch \
external/cppunit/unix.patch \

[Libreoffice-commits] core.git: external/cppunit

[Stephan Bergmann (via logerrit)]

 external/cppunit/UnpackedTarball_cppunit.mk |1 +
 external/cppunit/clang.patch.0  |   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit 9a23239b710e44754e4a28643420c9ba91552645
Author: Stephan Bergmann 
AuthorDate: Fri Feb 17 17:18:50 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Feb 20 19:25:25 2023 +

external/cppunit: Don't mis-apply GCC < 4.6 workaround for Clang

...which happens to define __GNUC__=4, __GNUC_MINOR__=2

Change-Id: I128547d0bd375ffec9deb6abd744eeb2667ba666
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147257
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/cppunit/UnpackedTarball_cppunit.mk 
b/external/cppunit/UnpackedTarball_cppunit.mk
index 4275c692e85e..d6304a96762e 100644
--- a/external/cppunit/UnpackedTarball_cppunit.mk
+++ b/external/cppunit/UnpackedTarball_cppunit.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
external/cppunit/windows-arm64.patch.1 \
external/cppunit/propagate-exceptions.patch.0 \
external/cppunit/sprintf.patch.0 \
+   external/cppunit/clang.patch.0 \
 ))
 ifeq ($(DISABLE_DYNLOADING),TRUE)
 $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
diff --git a/external/cppunit/clang.patch.0 b/external/cppunit/clang.patch.0
new file mode 100644
index ..7a520f27616d
--- /dev/null
+++ b/external/cppunit/clang.patch.0
@@ -0,0 +1,11 @@
+--- include/cppunit/TestAssert.h
 include/cppunit/TestAssert.h
+@@ -11,7 +11,7 @@
+ 
+ // Work around "passing 'T' chooses 'int' over 'unsigned int'" warnings when T
+ // is an enum type:
+-#if defined __GNUC__ && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 
6))
++#if defined __GNUC__ && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 
6)) && !defined __clang__
+ #pragma GCC system_header
+ #endif
+ 

[Libreoffice-commits] core.git: external/cppunit

[Stephan Bergmann (via logerrit)]

 external/cppunit/UnpackedTarball_cppunit.mk |1 +
 external/cppunit/sprintf.patch.0|   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit bd8a213c8ceccf66ab296ef0aea0fa4c451047e5
Author: Stephan Bergmann 
AuthorDate: Mon Feb 20 15:04:17 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Feb 20 16:09:24 2023 +

external/cppunit: Use snprintf instead of sprintf

...to avoid

> workdir/UnpackedTarball/cppunit/include/cppunit/TestAssert.h:115:8: 
error: 'sprintf' is deprecated: This function is provided for compatibility 
reasons only.  Due to security concerns inherent in the design of sprintf(3), 
it is highly recommended that you use snprintf(3) instead. 
[-Werror,-Wdeprecated-declarations]
>sprintf(buffer, "%.*g", precision, x);
>^
> 
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.1.sdk/usr/include/stdio.h:188:1:
 note: 'sprintf' has been explicitly marked deprecated here
> __deprecated_msg("This function is provided for compatibility reasons 
only.  Due to security concerns inherent in the design of sprintf(3), it is 
highly recommended that you use snprintf(3) instead.")
> ^
> 
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.1.sdk/usr/include/sys/cdefs.h:215:48:
 note: expanded from macro '__deprecated_msg'
> #define __deprecated_msg(_msg) 
__attribute__((__deprecated__(_msg)))
>   ^

on macOS after the upcoming <https://gerrit.libreoffice.org/c/core/+/147257>
"Don't mis-apply GCC < 4.6 workaround for Clang"

Change-Id: I213de1d112cb56fba220006842e611c56ccc7331
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147333
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/cppunit/UnpackedTarball_cppunit.mk 
b/external/cppunit/UnpackedTarball_cppunit.mk
index f6575bb8b969..4275c692e85e 100644
--- a/external/cppunit/UnpackedTarball_cppunit.mk
+++ b/external/cppunit/UnpackedTarball_cppunit.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
external/cppunit/order.patch.0 \
    external/cppunit/windows-arm64.patch.1 \
    external/cppunit/propagate-exceptions.patch.0 \
+   external/cppunit/sprintf.patch.0 \
 ))
 ifeq ($(DISABLE_DYNLOADING),TRUE)
 $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
diff --git a/external/cppunit/sprintf.patch.0 b/external/cppunit/sprintf.patch.0
new file mode 100644
index ..daa4881f3384
--- /dev/null
+++ b/external/cppunit/sprintf.patch.0
@@ -0,0 +1,11 @@
+--- include/cppunit/TestAssert.h
 include/cppunit/TestAssert.h
+@@ -112,7 +122,7 @@
+ #if defined(_MSC_VER) && defined(__STDC_SECURE_LIB__) // Use secure version 
with visual studio 2005 to avoid warning.
+sprintf_s(buffer, sizeof(buffer), "%.*g", precision, x); 
+ #else 
+-   sprintf(buffer, "%.*g", precision, x); 
++   snprintf(buffer, sizeof(buffer), "%.*g", precision, x); 
+ #endif
+return buffer;
+ }

[Libreoffice-bugs] [Bug 152315] No Cppunit pkg-config file generation on Windows

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=152315

QA Administrators  changed:

   What|Removed |Added

 Whiteboard|| QA:needsComment

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-commits] core.git: external/cppunit

[Stephan Bergmann (via logerrit)]

 external/cppunit/UnpackedTarball_cppunit.mk |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 45003656f41858de86de38c9ef4441fb227d7bc8
Author: Stephan Bergmann 
AuthorDate: Tue Dec 13 16:49:11 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Dec 13 17:47:15 2022 +

Mark external/cppunit/propagate-exceptions.patch.0 as upstreamed

Change-Id: I847b682c2823dcaf523f361044105e91462fbc3d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144075
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/cppunit/UnpackedTarball_cppunit.mk 
b/external/cppunit/UnpackedTarball_cppunit.mk
index d5a3ddea2ddf..f6575bb8b969 100644
--- a/external/cppunit/UnpackedTarball_cppunit.mk
+++ b/external/cppunit/UnpackedTarball_cppunit.mk
@@ -14,7 +14,10 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,cppunit,$(CPPUNIT_TARBALL),,cppunit
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,cppunit))
 
 # * external/cppunit/order.patch.0 upstreamed at 
<https://gerrit.libreoffice.org/c/cppunit/+/123963>
-#   "Run tests in deterministic order":
+#   "Run tests in deterministic order";
+# * external/cppunit/propagate-exceptions.patch.0 upstreamed at
+#   <https://gerrit.libreoffice.org/c/cppunit/+/144074> "Introduce 
CPPUNIT_PROPAGATE_EXCEPTIONS
+#   environment variable":
 $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
external/cppunit/windows.patch \
external/cppunit/unix.patch \

[Libreoffice-commits] cppunit.git: src/cppunit

[Libreoffice Gerrit user]

 src/cppunit/TestResult.cpp |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 01037c3ebee72192e31e44f5d38baf575832e77d
Author: Stephan Bergmann 
AuthorDate: Tue Dec 13 16:44:03 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Dec 13 16:15:21 2022 +

Introduce CPPUNIT_PROPAGATE_EXCEPTIONS environment variable

Often a developer debugging a failing CppUnit test wants a core dump with 
the
place where an uncaught exception is thrown.  So if the newly introduced
CPPUNIT_PROPAGATE_EXCEPTIONS environment variable is set (to any value), 
disable
the DefaultProtector that would otherwise catch such exceptions (and just 
report
some limited information about them).

Change-Id: Iac0e98837381578759384e45829fb4e2436f450a
Reviewed-on: https://gerrit.libreoffice.org/c/cppunit/+/144074
Reviewed-by: Markus Mohrhard 
Tested-by: Stephan Bergmann 

diff --git a/src/cppunit/TestResult.cpp b/src/cppunit/TestResult.cpp
index ad880bc..b3a1601 100644
--- a/src/cppunit/TestResult.cpp
+++ b/src/cppunit/TestResult.cpp
@@ -5,6 +5,7 @@
 #include 
 #include 
 #include 
+#include 
 #include "DefaultProtector.h"
 #include "ProtectorChain.h"
 #include "ProtectorContext.h"
@@ -18,7 +19,8 @@ TestResult::TestResult( SynchronizationObject *syncObject )
 , m_protectorChain( new ProtectorChain )
 , m_stop( false )
 { 
-  m_protectorChain->push( new DefaultProtector() );
+  if (!std::getenv("CPPUNIT_PROPAGATE_EXCEPTIONS"))
+m_protectorChain->push( new DefaultProtector() );
 }
 
 

[Libreoffice-commits] core.git: external/cppunit sal/cppunittester unotest/source

[Stephan Bergmann (via logerrit)]

 external/cppunit/UnpackedTarball_cppunit.mk|1 
 external/cppunit/propagate-exceptions.patch.0  |   20 
++
 sal/cppunittester/cppunittester.cxx|   11 +++--
 unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx |3 +
 4 files changed, 29 insertions(+), 6 deletions(-)

New commits:
commit 81719351c67385dece9dc6656530de31f5778f03
Author: Stephan Bergmann 
AuthorDate: Fri Dec 9 17:29:00 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Sat Dec 10 10:20:39 2022 +

Introduce CPPUNIT_PROPAGATE_EXCEPTIONS environment variable

Often a developer debugging a failing CppUnit test wants a core dump with 
the
place where an uncaught exception is thrown.  So if the newly introduced
CPPUNIT_PROPAGATE_EXCEPTIONS environment variable is set (to any value), 
disable
all the protectors that would otherwise catch such exceptions (and just 
report
some limited information about them).

Change-Id: I3052f71c0787583c496279a6f5b35a0299c357b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143882
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/cppunit/UnpackedTarball_cppunit.mk 
b/external/cppunit/UnpackedTarball_cppunit.mk
index 5dc750bbdd9b..d5a3ddea2ddf 100644
--- a/external/cppunit/UnpackedTarball_cppunit.mk
+++ b/external/cppunit/UnpackedTarball_cppunit.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
external/cppunit/rtti.patch.0 \
external/cppunit/order.patch.0 \
external/cppunit/windows-arm64.patch.1 \
+   external/cppunit/propagate-exceptions.patch.0 \
 ))
 ifeq ($(DISABLE_DYNLOADING),TRUE)
 $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
diff --git a/external/cppunit/propagate-exceptions.patch.0 
b/external/cppunit/propagate-exceptions.patch.0
new file mode 100644
index ..dd9a6b32c542
--- /dev/null
+++ b/external/cppunit/propagate-exceptions.patch.0
@@ -0,0 +1,20 @@
+--- src/cppunit/TestResult.cpp
 src/cppunit/TestResult.cpp
+@@ -5,6 +5,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include "DefaultProtector.h"
+ #include "ProtectorChain.h"
+ #include "ProtectorContext.h"
+@@ -18,7 +19,8 @@
+ , m_protectorChain( new ProtectorChain )
+ , m_stop( false )
+ { 
+-  m_protectorChain->push( new DefaultProtector() );
++  if (!std::getenv("CPPUNIT_PROPAGATE_EXCEPTIONS"))
++m_protectorChain->push( new DefaultProtector() );
+ }
+ 
+ 
diff --git a/sal/cppunittester/cppunittester.cxx 
b/sal/cppunittester/cppunittester.cxx
index 81ddec1568ed..8a9e184c431d 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -465,16 +465,17 @@ static bool main2()
 std::exit(EXIT_FAILURE);
 }
 #endif
-CppUnit::Protector *protector = fn == nullptr
-? nullptr
-: (*reinterpret_cast< cppunittester::ProtectorFactory * >(fn))();
-if (protector == nullptr) {
+if (fn == nullptr) {
 std::cerr
 << "Failure instantiating protector \"" << convertLazy(lib)
 << "\", \"" << convertLazy(sym) << '"' << std::endl;
 std::exit(EXIT_FAILURE);
 }
-protectors.push_back(protector);
+CppUnit::Protector *protector =
+(*reinterpret_cast< cppunittester::ProtectorFactory * >(fn))();
+if (protector != nullptr) {
+protectors.push_back(protector);
+}
 index+=3;
 }
 
diff --git a/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx 
b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
index 7a5b17b750c9..764f49d79bf5 100644
--- a/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
+++ b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 #include 
 #include 
 
@@ -75,7 +76,7 @@ bool Prot::protect(
 
 extern "C" SAL_DLLPUBLIC_EXPORT CppUnit::Protector *
 unoexceptionprotector() {
-return new Prot;
+return std::getenv("CPPUNIT_PROPAGATE_EXCEPTIONS") == nullptr ? new Prot : 
nullptr;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - configure.ac external/cppunit

[Christian Lohmaier (via logerrit)]

 configure.ac  |7 ++-
 external/cppunit/enable-win32-debug.patch |4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 1df094470ddf3c9c46dbc289e1582814acf6159d
Author: Christian Lohmaier 
AuthorDate: Tue Nov 29 12:28:20 2022 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Dec 3 17:41:45 2022 +

accept Apple's patch utility - pickier than GNU patch, but should be OK

macOS Ventura replaced the patch utility by Apple's version:
patch 2.0-12u11-Apple (as of macOS 13.0.1)

It is picker/less robust when it comes to locating matches, and absolutely
refuses to apply when the hunks are out of order. Only one patch needed
rework in the current codebase (master an 7-4 branch), and being more 
correct
about the locations in the files to be patched is not a bad thing either, so
accept Apple's version of patch (with a warning for now)

Change-Id: I707d00958b814307b13caf9923f1de7f3919442c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143461
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 
(cherry picked from commit ce31e09a6d40295cec4be9da8f4cec886d6c92c1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143438
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/configure.ac b/configure.ac
index 5fe365b1b5d2..b9e13de79a57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11496,7 +11496,12 @@ if test "$_os" = "SunOS" -o "$_os" = "Darwin"; then
 if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 
2>/dev/null; then
 AC_MSG_RESULT([yes])
 else
-AC_MSG_ERROR([no, GNU patch needed. install or specify with 
--with-gnu-patch=/path/to/it])
+if $GNUPATCH --version | grep "2\.0-.*-Apple" >/dev/null 2>/dev/null; 
then
+AC_MSG_RESULT([no, but accepted (Apple patch)])
+add_warning "patch utility is not GNU patch. Apple's patch should 
work OK, but it might experience issues where GNU patch doesn't."
+else
+AC_MSG_ERROR([no, GNU patch needed. install or specify with 
--with-gnu-patch=/path/to/it])
+fi
 fi
 else
 GNUPATCH=$PATCH
diff --git a/external/cppunit/enable-win32-debug.patch 
b/external/cppunit/enable-win32-debug.patch
index dc159ecc51ad..2c7f4f956d2f 100644
--- a/external/cppunit/enable-win32-debug.patch
+++ b/external/cppunit/enable-win32-debug.patch
@@ -1,6 +1,6 @@
 --- misc/cppunit-1.14.0/src/cppunit/cppunit_dll.vcxproj
 +++ misc/build/cppunit-1.14.0/src/cppunit/cppunit_dll.vcxproj
-@@ -107,7 +107,6 @@
+@@ -190,7 +190,6 @@
true
Level3
true
@@ -8,7 +8,7 @@

..\..\include;%(AdditionalIncludeDirectories)

WIN32;NDEBUG;_WINDOWS;_USRDLL;CPPUNIT_BUILD_DLL;%(PreprocessorDefinitions)
.\ReleaseDll\
-@@ -138,6 +137,7 @@
+@@ -222,6 +221,7 @@
  
true
true

[Libreoffice-bugs] [Bug 152315] New: No Cppunit pkg-config file generation on Windows

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=152315

Bug ID: 152315
   Summary: No Cppunit pkg-config file generation on Windows
   Product: cppunit
   Version: unspecified
  Hardware: x86-64 (AMD64)
OS: Windows (All)
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: General
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: sch...@groupeastek.fr
CC: markus.mohrh...@googlemail.com

Dear CppUnit Developers,

I installed CppUnit 1.15 on Windows 10. However, I can't find any cppunit.pc
file:

PS C:\URANIE\17933> gci .\outputs\cppunit\ -Filter "*.dll" -Recurse


Répertoire : C:\URANIE\17933\outputs\cppunit\bin


Mode LastWriteTime Length Name
 - -- 
--30/11/2022 14:58 216064 cppunit_dll.dll


PS C:\URANIE\17933> gci .\outputs\cppunit\ -Filter "*.pc" -Recurse
PS C:\URANIE\17933>

Can you solve this issue?

Having a pkg-config metadata file can ease CppUnit detection.

Best Regards,

Salomon

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-commits] core.git: configure.ac external/cppunit

[Christian Lohmaier (via logerrit)]

 configure.ac  |7 ++-
 external/cppunit/enable-win32-debug.patch |4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit ce31e09a6d40295cec4be9da8f4cec886d6c92c1
Author: Christian Lohmaier 
AuthorDate: Tue Nov 29 12:28:20 2022 +0100
Commit: Christian Lohmaier 
CommitDate: Tue Nov 29 14:14:22 2022 +0100

accept Apple's patch utility - pickier than GNU patch, but should be OK

macOS Ventura replaced the patch utility by Apple's version:
patch 2.0-12u11-Apple (as of macOS 13.0.1)

It is picker/less robust when it comes to locating matches, and absolutely
refuses to apply when the hunks are out of order. Only one patch needed
rework in the current codebase (master an 7-4 branch), and being more 
correct
about the locations in the files to be patched is not a bad thing either, so
accept Apple's version of patch (with a warning for now)

Change-Id: I707d00958b814307b13caf9923f1de7f3919442c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143461
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/configure.ac b/configure.ac
index bea2bd98a22e..d6c1ac9fa3fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11542,7 +11542,12 @@ if test "$_os" = "SunOS" -o "$_os" = "Darwin"; then
 if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 
2>/dev/null; then
 AC_MSG_RESULT([yes])
 else
-AC_MSG_ERROR([no, GNU patch needed. install or specify with 
--with-gnu-patch=/path/to/it])
+if $GNUPATCH --version | grep "2\.0-.*-Apple" >/dev/null 2>/dev/null; 
then
+AC_MSG_RESULT([no, but accepted (Apple patch)])
+add_warning "patch utility is not GNU patch. Apple's patch should 
work OK, but it might experience issues where GNU patch doesn't."
+else
+AC_MSG_ERROR([no, GNU patch needed. install or specify with 
--with-gnu-patch=/path/to/it])
+fi
 fi
 else
 GNUPATCH=$PATCH
diff --git a/external/cppunit/enable-win32-debug.patch 
b/external/cppunit/enable-win32-debug.patch
index dc159ecc51ad..2c7f4f956d2f 100644
--- a/external/cppunit/enable-win32-debug.patch
+++ b/external/cppunit/enable-win32-debug.patch
@@ -1,6 +1,6 @@
 --- misc/cppunit-1.14.0/src/cppunit/cppunit_dll.vcxproj
 +++ misc/build/cppunit-1.14.0/src/cppunit/cppunit_dll.vcxproj
-@@ -107,7 +107,6 @@
+@@ -190,7 +190,6 @@
true
Level3
true
@@ -8,7 +8,7 @@

..\..\include;%(AdditionalIncludeDirectories)

WIN32;NDEBUG;_WINDOWS;_USRDLL;CPPUNIT_BUILD_DLL;%(PreprocessorDefinitions)
.\ReleaseDll\
-@@ -138,6 +137,7 @@
+@@ -222,6 +221,7 @@
  
true
true

[Libreoffice-bugs] [Bug 149094] Error running cppunit automated test.

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=149094

Aron Budea  changed:

   What|Removed |Added

 Blocks||126862


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=126862
[Bug 126862] [META] Issues with unusual builds / unit tests
-- 
You are receiving this mail because:
You are the assignee for the bug.

Error running cppunit automated test

[Lera Goncharuk]

Hi all!

I did 'make check' and got an error in the cpptest. [1] At the request
of Xisco Faulí, I am redirecting the description of the bug here.

OS: Kubuntu 20.04
System Locale: LANG=ru_RU.UTF-8
LO version: on commit 9b1dcd8f591edc6ed1a6db469956985b59badaf5
The error is reproduced stably.

Progress:
git clone https://gerrit.libreoffice.org/core libreoffice
./autogen.sh --enable-dbgutil --enable-debug --enable-symbols
--with-help --with-symbol-config --with-lang="en" --with-locales="en
ru "
make
make check

Expected Result:
Automatic execution of all CppUnit tests.

Actual result:

failures!!!
Run: 23 Failure total: 1 Failures: 1 Errors: 0

Error: a unit test failed, please do one of:

make CppunitTest_basic_macros CPPUNITTRACE="gdb --args"
# for interactive debugging on Linux
make CppunitTest_basic_macros VALGRIND=memcheck
# for memory checking
make CppunitTest_basic_macros DEBUGCPPUNIT=TRUE
# for exception catching

You can limit the execution to just one particular test by:

make CPPUNIT_TEST_NAME="testXYZ" ...above mentioned params...

make[1]: *** [/home/lera/project/libreoffice/solenv/gbuild/CppunitTest.mk:121:
/home/lera/project/libreoffice/workdir/CppunitTest/basic_macros.test]

The full test execution log [2].

[1] https://bugs.documentfoundation.org/show_bug.cgi?id=149094
[2] https://bug-attachments.documentfoundation.org/attachment.cgi?id=180125

Best regards, Lera

[Libreoffice-bugs] [Bug 149094] Error running cppunit automated test.

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=149094

Xisco Faulí  changed:

   What|Removed |Added

 Resolution|--- |MOVED
 CC||xiscofa...@libreoffice.org
 Status|UNCONFIRMED |RESOLVED

--- Comment #5 from Xisco Faulí  ---
I believe this should be discussed in the development mailinglist.
@tagezi, could you please send an email to the dev list ?

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 149094] Error running cppunit automated test.

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=149094

--- Comment #4 from himajin100...@gmail.com ---
what if you build and test with any of ja,zh,ko?
https://opengrok.libreoffice.org/search?full=HALFWIDTH_FULLWIDTH=core

like
--with-locales="en ru ja"

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 149094] Error running cppunit automated test.

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=149094

--- Comment #3 from himajin100...@gmail.com ---
U+FF21 Ａ=> EF BC A1 in UTF-8

U+00EF ï => C3 AF
U+00BC ¼ => C2 BC
U+00A1 ¡ => C2 A1

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 149094] Error running cppunit automated test.

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=149094

--- Comment #2 from Andreas Heinisch  ---
It fails here, and atm I don't know why. I did not change any transliteration:

 Failed: StrConv("ABCDEVB¥ì¥¹¥­¥å©", vbWide) returned
ABCDEVB¥ì¥¹¥­¥å©, expected ＡＢＣＤＥＶＢ￥ì￥¹￥­￥å©
 Failed: StrConv("ï¼¡ï¼¢ï¼£ï¼¤ï¼ ï¼„ï¼…ï¼’ï¼“ï¼‡ï¼Ÿï¼¥ï¼§", vbNarrow) returned
ï¼¡ï¼¢ï¼£ï¼¤ï¼ ï¼„ï¼…ï¼’ï¼“ï¼‡ï¼Ÿï¼¥ï¼§, expected ABCD@$%23'?EG
 Failed: StrConv("ã‹ãŸã‹ãª", vbKatakana) returned ã‹ãŸã‹ãª, expected
カタカナ
 Failed: StrConv("カタカナ", vbHiragana) returned カタカナ, expected
ã‹ãŸã‹ãª
Tests passed: 14
Tests failed: 4

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 149094] Error running cppunit automated test.

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=149094

Buovjaga  changed:

   What|Removed |Added

 CC||andreas.heini...@yahoo.de,
   ||ilmari.lauhakangas@libreoff
   ||ice.org

--- Comment #1 from Buovjaga  ---
Andreas: any idea about this as you recently did some work that seems related?
Somehow it seems tagezi's system is producing strange results.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 149094] Error running cppunit automated test.

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=149094

tagezi  changed:

   What|Removed |Added

Summary|Error [Makefile:288: build] |Error running cppunit
   |running cppunit automated   |automated test.
   |test.   |

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 149094] New: Error [Makefile:288: build] running cppunit automated test.

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=149094

Bug ID: 149094
   Summary: Error [Makefile:288: build] running cppunit automated
test.
   Product: cppunit
   Version: unspecified
  Hardware: x86-64 (AMD64)
OS: Linux (All)
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: General
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: lera.goncha...@gmail.com
CC: markus.mohrh...@googlemail.com

Created attachment 180125
  --> https://bugs.documentfoundation.org/attachment.cgi?id=180125=edit
Full log running

Progress:
git clone https://gerrit.libreoffice.org/core libreoffice
./autogen.sh --enable-dbgutil --enable-debug --enable-symbols --with-help
--with-symbol-config --with-lang="en" --with-locales="en ru "
make
make check

Expected Result:
Automatic execution of all CppUnit tests.

Actual result:
After successful passing of the test_vba.cxx:176:Assertion, an error occurs
with the parameters

failures!!!
Run: 23 Failure total: 1 Failures: 1 Errors: 0

Error: a unit test failed, please do one of:

make CppunitTest_basic_macros CPPUNITTRACE="gdb --args"
# for interactive debugging on Linux
make CppunitTest_basic_macros VALGRIND=memcheck
# for memory checking
make CppunitTest_basic_macros DEBUGCPPUNIT=TRUE
# for exception catching

You can limit the execution to just one particular test by:

make CPPUNIT_TEST_NAME="testXYZ" ...above mentioned params...

make[1]: *** [/home/lera/project/libreoffice/solenv/gbuild/CppunitTest.mk:121:
/home/lera/project/libreoffice/workdir/CppunitTest/basic_macros.test]

The full test execution log is in the attached file.

OS: Kubuntu 20.04
LO version: on commit 9b1dcd8f591edc6ed1a6db469956985b59badaf5
The error is reproduced stably.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-commits] cppunit.git: src/cppunit

[Libreoffice Gerrit user]

 src/cppunit/TestFactoryRegistry.cpp |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 64eaa35c2de99581e522608e841defffb4b2923b
Author: Stephan Bergmann 
AuthorDate: Thu Oct 21 11:14:34 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Apr 11 14:14:52 2022 +0200

Run tests in deterministic order

LibreOffice already benefits from this (see

<https://git.libreoffice.org/core/+/2f2246d22e2a8ccbc1dc3e6f5243734a61edf270%5E!>
"external/cppunit: Run tests in deterministic order", especially as 
otherwise
the order in which tests happened to get run differed between --disable-lto 
and
--enable-lto builds.

Change-Id: I87d6d7cb0f4c2f6a0ea1ac3ba3d48b4e089eb5c7
Reviewed-on: https://gerrit.libreoffice.org/c/cppunit/+/123963
Tested-by: Stephan Bergmann 
Reviewed-by: Stephan Bergmann 

diff --git a/src/cppunit/TestFactoryRegistry.cpp 
b/src/cppunit/TestFactoryRegistry.cpp
index 35448a6..3b68d58 100644
--- a/src/cppunit/TestFactoryRegistry.cpp
+++ b/src/cppunit/TestFactoryRegistry.cpp
@@ -143,12 +143,20 @@ TestFactoryRegistry::makeTest()
 void 
 TestFactoryRegistry::addTestToSuite( TestSuite *suite )
 {
+  std::multimap sorted;
   for ( Factories::iterator it = m_factories.begin(); 
 it != m_factories.end(); 
 ++it )
   {
 TestFactory *factory = *it;
-suite->addTest( factory->makeTest() );
+Test *test = factory->makeTest();
+sorted.insert({test->getName(), test});
+  }
+  // In the unlikely case of multiple Tests with identical names, those will
+  // still be added in random order:
+  for (auto const : sorted)
+  {
+suite->addTest( i.second );
   }
 }
 

[Libreoffice-commits] core.git: configure.ac external/cairo external/cppunit external/freetype external/libnumbertext solenv/gbuild static/README.wasm.md

[Jan-Marek Glogowski (via logerrit)]

 configure.ac|   21 +--
 external/cairo/ExternalProject_cairo.mk |2 -
 external/cppunit/ExternalProject_cppunit.mk |4 +-
 external/freetype/ExternalProject_freetype.mk   |2 -
 external/libnumbertext/ExternalProject_libnumbertext.mk |4 +-
 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk  |3 +-
 static/README.wasm.md   |   22 +---
 7 files changed, 45 insertions(+), 13 deletions(-)

New commits:
commit 79365d6f5a3706da8464d564deee6bb54422c3d0
Author: Jan-Marek Glogowski 
AuthorDate: Sat Mar 26 20:46:56 2022 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Wed Mar 30 15:12:21 2022 +0200

WASM fix native EH build since Emscripten 3.1.6

Building LO with WASM native EH and Emscripten 3.1.6+, the link
fails with a missing "emscripten_longjmp" symbol. Actually the
old build was simply wrong, because the emscripten_longjmp
function is just used for the Emscripten SjLj and not the native
WASM SjLj implementation. Linking just worked, because the used
libcompiler_rt-wasm-sjlj-mt.a lib was incorrectly providing that
symbol, which 3.1.6 removed.

But since running the NEH build still fails early in the same way
then before in FF nightly 100 and Chrome (= failure in the LO job
scheduler calling Task::UpdateMinPeriod for the "desktop::Desktop
m_firstRunTimer" timer, resulting in a WASM VM "RuntimeError:
indirect call signature mismatch"), there is still no way to know,
if nothing else it missing. The Emscripten / JS EH build still
works without any code changes. And it's not the first call on
a job object that fails...

And unfortunatly, because Qt itself also uses libpng, it also uses
SjLj for error handling, like LO in the image import, so the Qt
build must also be patched to build with "-s SUPPORT_LONGJMP=wasm".
Simply enough to do (see README.wasm.md). LO's configure now
detects that symbol and will bail out on incompatible Qt and LO
build setup.

See https://github.com/emscripten-core/emscripten/issues/16572

Change-Id: I3a1877f3aeb77873906176b9d3cd1ea92973f1f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132139
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/configure.ac b/configure.ac
index 9d97f42c4030..224faea12abf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4625,10 +4625,10 @@ check_use_ld()
 fi
 else
 # I tried to use gcc's '-B' and a directory + symlink setup 
in
-   # $BUILDDIR, but libtool always filtered-out that option, so gcc 
wouldn't
-   # pickup the alternative linker, when called by libtool for linking.
+# $BUILDDIR, but libtool always filtered-out that option, so gcc 
wouldn't
+# pickup the alternative linker, when called by libtool for 
linking.
 # For mold, one can use LD_PRELOAD=/usr/lib/mold/mold-wrapper.so 
instead.
-   AC_MSG_ERROR([A linker path is just supported with clang, because 
of libtool's -B filtering!])
+AC_MSG_ERROR([A linker path is just supported with clang, because 
of libtool's -B filtering!])
 fi
 fi
 use_ld_fail_if_error=$2
@@ -12966,6 +12966,21 @@ then
 if test ! -f "${qt5_platformsdir}"/libqwasm.a -o ! -f 
"$QT5_PLATFORMS_SRCDIR"/wasm_shell.html; then
 AC_MSG_ERROR([No Qt5 WASM QPA plugin found in ${qt5_platformsdir} 
or ${QT5_PLATFORMS_SRCDIR}])
 fi
+
+EMSDK_LLVM_NM="$(em-config EMSCRIPTEN_ROOT)"/../bin/llvm-nm
+if ! test -x "$EMSDK_LLVM_NM"; then
+AC_MSG_ERROR([Missing llvm-nm expected to be found at 
"$EMSDK_LLVM_NM".])
+fi
+if test ! -f "${qt5_libdir}"/libQt5Gui.a; then
+AC_MSG_ERROR([No Qt5 WASM libQt5Gui.a in ${qt5_libdir}])
+fi
+QT5_WASM_SJLJ="`${EMSDK_LLVM_NM} "${qt5_libdir}"/libQt5Gui.a 
2>/dev/null | $GREP emscripten_longjmp`"
+if test "$ENABLE_WASM_EXCEPTIONS" = TRUE -a -n "$QT5_WASM_SJLJ"; then
+AC_MSG_ERROR(['emscripten_longjmp' symbol found in libQt5Gui.a 
(missing '-s SUPPORT_LONGJMP=wasm'). See static/README.wasm.md.])
+fi
+if test "$ENABLE_WASM_EXCEPTIONS" != TRUE -a -z "$QT5_WASM_SJLJ"; then
+AC_MSG_ERROR(['emscripten_longjmp' symbol not found in 
libQt5Gui.a. You probably use an incompatible Qt build with '-s 
SUPPORT_LONGJMP=wasm'.])
+fi
 fi
 
 QT5_CFLAGS="-I$qt5_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT 
-DQT_NO_VERSION_TAGGING"
diff --git a/external/cairo/ExternalProject_cairo.mk 
b/external/cairo/ExternalProject_cairo.mk
index f1bf3ddbd1b2..0996572d63b

[Libreoffice-commits] core.git: external/cairo external/coinmp external/cppunit external/curl external/expat external/firebird external/fontconfig external/freetype external/gpgmepp external/harfbuzz

[Jan-Marek Glogowski (via logerrit)]

 external/cairo/ExternalProject_cairo.mk |4 ++--
 external/cairo/ExternalProject_pixman.mk|4 ++--
 external/coinmp/ExternalProject_coinmp.mk   |2 +-
 external/cppunit/ExternalProject_cppunit.mk |2 +-
 external/curl/ExternalProject_curl.mk   |2 +-
 external/expat/ExternalProject_expat.mk |4 ++--
 external/firebird/ExternalProject_firebird.mk   |2 +-
 external/fontconfig/ExternalProject_fontconfig.mk   |2 +-
 external/freetype/ExternalProject_freetype.mk   |2 +-
 external/gpgmepp/ExternalProject_gpgmepp.mk |3 ++-
 external/harfbuzz/ExternalProject_harfbuzz.mk   |2 +-
 external/hunspell/ExternalProject_hunspell.mk   |2 +-
 external/hyphen/ExternalProject_hyphen.mk   |3 ++-
 external/icu/ExternalProject_icu.mk |6 --
 external/lcms2/ExternalProject_lcms2.mk |4 ++--
 external/libabw/ExternalProject_libabw.mk   |2 +-
 external/libassuan/ExternalProject_libassuan.mk |2 +-
 external/libatomic_ops/ExternalProject_libatomic_ops.mk |2 +-
 external/libcdr/ExternalProject_libcdr.mk   |2 +-
 external/libebook/ExternalProject_libebook.mk   |2 +-
 external/libepubgen/ExternalProject_libepubgen.mk   |2 +-
 external/libetonyek/ExternalProject_libetonyek.mk   |2 +-
 external/libexttextcat/ExternalProject_libexttextcat.mk |2 +-
 external/libffi/ExternalProject_libffi.mk   |2 +-
 external/libfreehand/ExternalProject_libfreehand.mk |2 +-
 external/libgpg-error/ExternalProject_libgpg-error.mk   |2 +-
 external/liblangtag/ExternalProject_liblangtag.mk   |4 ++--
 external/libmspub/ExternalProject_libmspub.mk   |2 +-
 external/libmwaw/ExternalProject_libmwaw.mk |2 +-
 external/libnumbertext/ExternalProject_libnumbertext.mk |2 +-
 external/libodfgen/ExternalProject_libodfgen.mk |2 +-
 external/liborcus/ExternalProject_liborcus.mk   |2 +-
 external/libpagemaker/ExternalProject_libpagemaker.mk   |2 +-
 external/libqxp/ExternalProject_libqxp.mk   |2 +-
 external/librevenge/ExternalProject_librevenge.mk   |2 +-
 external/libstaroffice/ExternalProject_libstaroffice.mk |2 +-
 external/libvisio/ExternalProject_libvisio.mk   |2 +-
 external/libwpd/ExternalProject_libwpd.mk   |2 +-
 external/libwpg/ExternalProject_libwpg.mk   |2 +-
 external/libwps/ExternalProject_libwps.mk   |2 +-
 external/libxml2/ExternalProject_libxml2.mk |2 +-
 external/libxslt/ExternalProject_libxslt.mk |2 +-
 external/libzmf/ExternalProject_libzmf.mk   |2 +-
 external/mythes/ExternalProject_mythes.mk   |3 ++-
 external/nss/ExternalProject_nss.mk |9 -
 external/openldap/ExternalProject_openldap.mk   |2 +-
 external/postgresql/ExternalProject_postgresql.mk   |2 +-
 external/python3/ExternalProject_python3.mk |2 +-
 external/redland/ExternalProject_raptor.mk  |4 ++--
 external/redland/ExternalProject_rasqal.mk  |4 ++--
 external/redland/ExternalProject_redland.mk |4 ++--
 external/xmlsec/ExternalProject_xmlsec.mk   |2 +-
 solenv/gbuild/gbuild.mk |2 ++
 solenv/gbuild/platform/windows.mk   |4 
 54 files changed, 75 insertions(+), 65 deletions(-)

New commits:
commit 4537886ec1de8beed02c7aea34a50727bc058bbd
Author: Jan-Marek Glogowski 
AuthorDate: Sat Jan 29 19:58:44 2022 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Mon Jan 31 10:31:04 2022 +0100

externals: always provide platform configure flags

No idea why we just provided the platform flags when cross-
compiling. In the curious case, where the host platform is
detected as x86_64-pc-mingw32 per default and we actually
want to override it with x86_64-pc-cygwin, we don't do a
cross compile, but must override the host platform.

But there is additional special handling needed for the omitted
cross-platform build in the special case of --host=i686-pc-cygwin
and --build=x86_64-pc-cygwin, where we deliberatly ignore cross
building; Windows is already a slow build, so try to keep this
optimization (AMD64 can execute x86 binaries).

There is the theoretical case, where the externals config.guess
would have detected something else and that "magically" even
worked, while the LO detected triplet would fail, but this
should be fixed in the external in any way.

Change-Id: Ib7a9719e0e406fe90334b7611dc3f01b51692bfa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129153

[Libreoffice-commits] core.git: config_host.mk.in configure.ac external/cppunit external/gpgmepp external/hunspell external/libnumbertext external/liborcus external/libwps solenv/gbuild

[Stephan Bergmann (via logerrit)]

 config_host.mk.in   |1 +
 configure.ac|3 +++
 external/cppunit/ExternalProject_cppunit.mk |6 +-
 external/gpgmepp/ExternalProject_gpgmepp.mk |2 +-
 external/hunspell/ExternalProject_hunspell.mk   |6 +-
 external/libnumbertext/ExternalProject_libnumbertext.mk |6 +-
 external/liborcus/ExternalProject_liborcus.mk   |6 +-
 external/libwps/ExternalProject_libwps.mk   |6 +-
 solenv/gbuild/platform/com_GCC_defs.mk  |8 
 solenv/gbuild/platform/solaris.mk   |7 ---
 solenv/gbuild/platform/unxgcc.mk|7 ---
 11 files changed, 18 insertions(+), 40 deletions(-)

New commits:
commit 7158acde7756a264c09e24e1cfe4c81db700b920
Author: Stephan Bergmann 
AuthorDate: Thu Nov 4 11:03:11 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Nov 4 12:49:44 2021 +0100

Consolidate -D_GLIBCXX_DEBUG for --enable-dbgutil builds against libstdc++

(this was meant as a prerequisite for enabling its -D_LIBCPP_DEBUG=1 
counterpart
when building against libc++ on macOS, but which got stalled for now after
running into the issue described at
<https://lists.llvm.org/pipermail/libcxx-dev/2021-October/001222.html>
"[libcxx-dev] Building a program with -D_LIBCPP_DEBUG=1 against a libc++ 
that is
not itself built with that define")

Change-Id: If466dce595a9311b2afbae41d5ddcaecc6f3c57b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124678
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/config_host.mk.in b/config_host.mk.in
index ff8944af0cce..43f65dfce39a 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -280,6 +280,7 @@ export 
HAVE_GCC_STACK_CLASH_PROTECTION=@HAVE_GCC_STACK_CLASH_PROTECTION@
 export HAVE_GNUMAKE_FILE_FUNC=@HAVE_GNUMAKE_FILE_FUNC@
 export HAVE_LD_BSYMBOLIC_FUNCTIONS=@HAVE_LD_BSYMBOLIC_FUNCTIONS@
 export HAVE_LD_HASH_STYLE=@HAVE_LD_HASH_STYLE@
+export HAVE_LIBSTDCPP=@HAVE_LIBSTDCPP@
 export HAVE_POSIX_FALLOCATE=@HAVE_POSIX_FALLOCATE@
 export HAVE_WDEPRECATED_COPY_DTOR=@HAVE_WDEPRECATED_COPY_DTOR@
 export HELP_ONLINE=@HELP_ONLINE@
diff --git a/configure.ac b/configure.ac
index a2a831da535a..112b82b14384 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7126,6 +7126,7 @@ dnl Identify the C++ library
 dnl ===
 
 AC_MSG_CHECKING([what the C++ library is])
+HAVE_LIBSTDCPP=
 AC_LANG_PUSH([C++])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include 
@@ -7135,6 +7136,7 @@ foo bar
 ]])],
 [CPP_LIBRARY=GLIBCXX
  cpp_library_name="GNU libstdc++"
+ HAVE_LIBSTDCPP=TRUE
 ],
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include 
@@ -7158,6 +7160,7 @@ foo bar
 AC_MSG_ERROR([Could not figure out what C++ library this is]
 AC_MSG_RESULT([$cpp_library_name])
 AC_LANG_POP([C++])
+AC_SUBST([HAVE_LIBSTDCPP])
 
 dnl ===
 dnl Check for gperf
diff --git a/external/cppunit/ExternalProject_cppunit.mk 
b/external/cppunit/ExternalProject_cppunit.mk
index e32bdb30f0b9..fee215adde59 100644
--- a/external/cppunit/ExternalProject_cppunit.mk
+++ b/external/cppunit/ExternalProject_cppunit.mk
@@ -30,11 +30,7 @@ else
 
 cppunit_CXXFLAGS=$(CXXFLAGS)
 
-ifneq (,$(filter ANDROID DRAGONFLY FREEBSD iOS LINUX NETBSD OPENBSD,$(OS)))
-ifneq (,$(gb_ENABLE_DBGUTIL))
-cppunit_CXXFLAGS+=-D_GLIBCXX_DEBUG
-endif
-endif
+cppunit_CXXFLAGS+=$(gb_COMPILERDEFS_STDLIB_DEBUG)
 
 ifneq (,$(call gb_LinkTarget__symbols_enabled,cppunit))
 cppunit_CXXFLAGS+=-g
diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk 
b/external/gpgmepp/ExternalProject_gpgmepp.mk
index 92348e426c80..a3166e94175e 100644
--- a/external/gpgmepp/ExternalProject_gpgmepp.mk
+++ b/external/gpgmepp/ExternalProject_gpgmepp.mk
@@ -65,7 +65,7 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build):
   CXXFLAGS='$(CXXFLAGS) \
$(if $(ENABLE_OPTIMIZED), \

$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \
-   $(if $(ENABLE_DBGUTIL),-D_GLIBCXX_DEBUG) \
+   $(gb_COMPILERDEFS_STDLIB_DEBUG) \
$(if $(call 
gb_Module__symbols_enabled,gpgmepp),$(gb_DEBUGINFO_FLAGS))' \
   $(if $(filter LINUX,$(OS)), \
'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
diff --git a/external/hunspell/ExternalProject_hunspell.mk 
b/external/hunspell/ExternalProject_hunspell.mk
index 51b693b06e08..f45e2834f869 100644
--- a/external/hunspell/ExternalProject_hunspell.mk
+++ b/external/hunspell/ExternalProject_hunspell.mk
@@ -15,11 +15,7 @@ $(eval $(call gb_ExternalProject_register_targets,hunspell,\
 
 hunspell_CPP

[Libreoffice-commits] core.git: external/cppunit

[Stephan Bergmann (via logerrit)]

 external/cppunit/UnpackedTarball_cppunit.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 538ba91535c9f13101c25e49a67e56559f389288
Author: Stephan Bergmann 
AuthorDate: Thu Oct 21 11:27:42 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 21 12:42:44 2021 +0200

Mark external/cppunit/order.patch.0 as upstreamed

Change-Id: Ic0bfacd74e007c979d574e65767cbfb0d40c9ef7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123965
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/cppunit/UnpackedTarball_cppunit.mk 
b/external/cppunit/UnpackedTarball_cppunit.mk
index 10063d2aa104..5dc750bbdd9b 100644
--- a/external/cppunit/UnpackedTarball_cppunit.mk
+++ b/external/cppunit/UnpackedTarball_cppunit.mk
@@ -13,6 +13,8 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,cppunit,$(CPPUNIT_TARBALL),,cppunit
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,cppunit))
 
+# * external/cppunit/order.patch.0 upstreamed at 
<https://gerrit.libreoffice.org/c/cppunit/+/123963>
+#   "Run tests in deterministic order":
 $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
    external/cppunit/windows.patch \
    external/cppunit/unix.patch \

[Libreoffice-commits] core.git: bin/gbuild-to-ide config_host.mk.in configure.ac external/breakpad external/coinmp external/cppunit external/lcms2 external/postgresql external/python3

[Mike Kaganski (via logerrit)]

 bin/gbuild-to-ide |6 +-
 config_host.mk.in |1 +
 configure.ac  |   22 --
 external/breakpad/ExternalProject_breakpad.mk |2 +-
 external/coinmp/ExternalProject_coinmp.mk |3 +--
 external/cppunit/ExternalProject_cppunit.mk   |3 +--
 external/lcms2/ExternalProject_lcms2.mk   |3 +--
 external/postgresql/ExternalProject_postgresql.mk |3 +--
 external/python3/ExternalProject_python3.mk   |3 +--
 9 files changed, 20 insertions(+), 26 deletions(-)

New commits:
commit 8e779c062a22a5755cae2c86787e16f59bfe4907
Author: Mike Kaganski 
AuthorDate: Fri Oct 8 10:51:50 2021 +0200
Commit: Mike Kaganski 
CommitDate: Fri Oct 8 14:54:10 2021 +0200

Centralize VS-to-toolset mapping in configure

This allows to define the mapping once, and avoid modification in
multiple places each time a new VS version support is added

Change-Id: I93de4c9d78c3f67a0a2e157007e9d13b6f557937
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123163
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 8e9d8ba157a6..430e4c96cbcc 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -916,7 +916,7 @@ class 
VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
 
 def __init__(self, gbuildparser, ide):
 IdeIntegrationGenerator.__init__(self, gbuildparser, ide)
-self.toolset = self.retrieve_toolset()
+self.toolset = os.environ['VCTOOLSET']
 self.solution_directory = self.gbuildparser.builddir
 self.configurations = {
 'Build': {
@@ -936,10 +936,6 @@ class 
VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
 }
 }
 
-def retrieve_toolset(self):
-ide_toolset_map = {'160': 'v142', '170': 'v143'}
-return ide_toolset_map[os.environ['VCVER']]
-
 def module_make_command(self, targets):
 return '%(sh)s -c "PATH=\\"/bin:$PATH\\";BUILDDIR=\\"%(builddir)s\\" 
%(makecmd)s -rsC %(location)s ' + targets + '"'
 
diff --git a/config_host.mk.in b/config_host.mk.in
index d84d5df0ac57..8d8b6e013db1 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -671,6 +671,7 @@ export UPDATE_CONFIG=@UPDATE_CONFIG@
 export UUIDGEN=@UUIDGEN@
 export VALGRIND_CFLAGS=$(gb_SPACE)@VALGRIND_CFLAGS@
 export VCL_PLUGIN_INFO=@VCL_PLUGIN_INFO@
+export VCTOOLSET=@VCTOOLSET@
 export VCVER=@VCVER@
 export DEVENV=@DEVENV@
 export VISIO_CFLAGS=$(gb_SPACE)@VISIO_CFLAGS@
diff --git a/configure.ac b/configure.ac
index c0713a64df5a..90fc05c31f80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3928,9 +3928,9 @@ find_msvc()
 {
 # Find Visual C++ 2019
 # Args: $1 (optional) : The VS version year
-# Return values: $vctest, $vcyear, $vcnum, $vcnumwithdot, $vcbuildnumber
+# Return values: $vctest, $vcyear, $vctoolset, $vcnumwithdot, 
$vcbuildnumber
 
-unset vctest vcnum vcnumwithdot vcbuildnumber
+unset vctest vctoolset vcnumwithdot vcbuildnumber
 
 vs_versions_to_check "$1"
 if test "$build_os" = wsl; then
@@ -3960,11 +3960,11 @@ find_msvc()
 case "$vcnumwithdot" in
 16.0)
 vcyear=2019
-vcnum=160
+vctoolset=v142
 ;;
 17.0)
 vcyear=2022
-vcnum=170
+vctoolset=v143
 ;;
 esac
 vcbuildnumber=`ls $vctest/VC/Tools/MSVC -A1r | head -1`
@@ -4127,13 +4127,14 @@ if test "$_os" = "WINNT"; then
 PathFormat "$COMPATH"
 COMPATH=`win_short_path_for_make "$formatted_path"`
 
-VCVER=$vcnum
+VCVER=$vcnumwithdot
+VCTOOLSET=$vctoolset
 
 # The WINDOWS_SDK_ACCEPTABLE_VERSIONS is mostly an educated guess...  
Assuming newer ones
 # are always "better", we list them in reverse chronological order.
 
-case "$vcnum" in
-160 | 170)
+case "$vcnumwithdot" in
+16.0 | 17.0)
 WINDOWS_SDK_ACCEPTABLE_VERSIONS="10.0 8.1A 8.1 8.0"
 ;;
 esac
@@ -4225,6 +4226,7 @@ if test "$_os" = "WINNT"; then
 AC_SUBST(CXX_X86_BINARY)
 fi
 AC_SUBST(VCVER)
+AC_SUBST(VCTOOLSET)
 AC_SUBST(DEVENV)
 AC_SUBST(MSVC_CXX)
 
@@ -6427,7 +6429,7 @@ find_msms()
 dnl the result will be the highest MSM version found in the highest 
directory.
 
 case "$VCVER" in
-160 | 170)
+16.0 | 17.0)
 my_msm_files="Microsoft_VC141_CRT_x86.msm Microsoft_VC142_CRT_x86.msm 
${my_msm_files}"
 ;;
 esac
@@ -6437,7 +6439,7 @@ find_msms()
 
 msmdir=
 case "$VCVER" in
-160 | 170)
+16.0 | 17.0)
 for f in ${my_msm_files}; do
 for l in `ls 

Re: cppunit Patch feature-modernize

[Florian Becker]

Hi Markus,

about the size_t changes. Most correct seams for me a solution to change all 
these to size_t and avoid casting, but that is a lot of work.

Let me know, if you need some kind of support.

Also, i saw, that you have not merges documentation termination for \n to \\n 
or c:\path to c:\\path.

The backslash is interpreted as command so you need to terminate it.

I have merged master from remote and new feature branch. So you can compare 
both to see, what patches are not yet merged.

Regards,
Florian

> Am 30.09.2021 um 21:55 schrieb Markus Mohrhard 
> :
> 
> Hey Florian,
> 
> On Fri, Oct 1, 2021 at 1:52 AM Markus Mohrhard 
> mailto:markus.mohrh...@googlemail.com>> 
> wrote:
> Hey Florian,
> 
> On Tue, Sep 28, 2021 at 5:59 PM Florian Becker  <mailto:f...@vxapps.com>> wrote:
> Hello,
> 
> i have patched the libcppunit 1.15.1 to modernize and use clang flags 
> with highest flag settings. Hopefully you can integrate this patch 
> inside master. https://github.com/VXAPPS/cppunit/tree/feature-modernize 
> <https://github.com/VXAPPS/cppunit/tree/feature-modernize>
> 
> If you have suggestions, please let me know.
> 
> I'll have a look during the next few days and will let you know if I have any 
> questions or comments
> 
> Thanks for your patches. The summary is:
> 
> * first patch was used without modifications
> * second patch was split up into smaller commits:
>* add [[noreturn]]
>* add override annotations
>* switch from throw to noexcept
>* remove semicolons
>* a complete removal of the old casting macros by me instead of your 
> addition to the portability header
>* replace 0 with nullptr
>* disable a few simple compiler warnings
> 
> I have not yet taken the size_t changes as that part contains some bugs. I 
> have already fixed one but want to have a second look and think about whether 
> this is how we want to solve this problem.
> I also had to remove all references to [[deprecated]] in this change as 
> [[deprecated]] is only C++14 and at least for now cppunit is still at C++11.
> 
> * I'll have to think a bit about the third and fourth patch. If I merge them 
> I'll let you know.
> 
> You can find the full code that I have pushed at:
> 
> https://git.libreoffice.org/cppunit/+log/refs/heads/master 
> <https://git.libreoffice.org/cppunit/+log/refs/heads/master>
> 
> Cheers,
> Markus
> 
> 
> 
> Cheers,
> Markus
> 
> 
> Regards,
> Florian
> 



smime.p7s
Description: S/MIME cryptographic signature

Re: cppunit Patch feature-modernize

[Florian Becker]

Hi,

> Am 01.10.2021 um 12:47 schrieb Markus Mohrhard 
> :
> 
> Hey,
> 
> On Fri, Oct 1, 2021 at 4:02 AM Florian Becker  <mailto:f...@vxapps.com>> wrote:
> Hi Markus,
> 
> thanks a lot.
> 
> Is there a list of compiler, which are supported? Also, is there any reason, 
> why cppunit cannot upgrade to c++17?
> 
> This would force all dependent projects to use C++17 as well. Already the 
> move to C++11 caused some issues for some older projects using cppunit. 
> Currently I don't see a compelling reason to update for cppunit. The decision 
> to move to C++11 was easier and provided a clear benefit.
Ok, understand. Mostly this can be done by compiler checks and flag the 
functionality. But i think you already know that...
> 
> 
> I would like to create a cmake definition - do we handle that the same way?
> 
> Have you had a look at the feature/cmake branch?
Not yet, never thought there would be such a branch. I’ll check it. Thanks for 
the information.

Regards,
Florian
> 
> Cheers,
> Markus
> 
> 
> Regards,
> Florian
> 
>> Am 30.09.2021 um 21:56 schrieb Markus Mohrhard 
>> mailto:markus.mohrh...@googlemail.com>>:
>> 
>> 
>> Hey Florian,
>> 
>> On Fri, Oct 1, 2021 at 1:52 AM Markus Mohrhard 
>> mailto:markus.mohrh...@googlemail.com>> 
>> wrote:
>> Hey Florian,
>> 
>> On Tue, Sep 28, 2021 at 5:59 PM Florian Becker > <mailto:f...@vxapps.com>> wrote:
>> Hello,
>> 
>> i have patched the libcppunit 1.15.1 to modernize and use clang flags 
>> with highest flag settings. Hopefully you can integrate this patch 
>> inside master. https://github.com/VXAPPS/cppunit/tree/feature-modernize 
>> <https://github.com/VXAPPS/cppunit/tree/feature-modernize>
>> 
>> If you have suggestions, please let me know.
>> 
>> I'll have a look during the next few days and will let you know if I have 
>> any questions or comments
>> 
>> Thanks for your patches. The summary is:
>> 
>> * first patch was used without modifications
>> * second patch was split up into smaller commits:
>>* add [[noreturn]]
>>* add override annotations
>>* switch from throw to noexcept
>>* remove semicolons
>>* a complete removal of the old casting macros by me instead of your 
>> addition to the portability header
>>* replace 0 with nullptr
>>* disable a few simple compiler warnings
>> 
>> I have not yet taken the size_t changes as that part contains some bugs. I 
>> have already fixed one but want to have a second look and think about 
>> whether this is how we want to solve this problem.
>> I also had to remove all references to [[deprecated]] in this change as 
>> [[deprecated]] is only C++14 and at least for now cppunit is still at C++11.
>> 
>> * I'll have to think a bit about the third and fourth patch. If I merge them 
>> I'll let you know.
>> 
>> You can find the full code that I have pushed at:
>> 
>> https://git.libreoffice.org/cppunit/+log/refs/heads/master 
>> <https://git.libreoffice.org/cppunit/+log/refs/heads/master>
>> 
>> Cheers,
>> Markus
>> 
>> 
>> 
>> Cheers,
>> Markus
>> 
>> 
>> Regards,
>> Florian
>> 



smime.p7s
Description: S/MIME cryptographic signature

Re: cppunit Patch feature-modernize

[Markus Mohrhard]

Hey,

On Fri, Oct 1, 2021 at 4:02 AM Florian Becker  wrote:

> Hi Markus,
>
> thanks a lot.
>
> Is there a list of compiler, which are supported? Also, is there any
> reason, why cppunit cannot upgrade to c++17?
>

This would force all dependent projects to use C++17 as well. Already the
move to C++11 caused some issues for some older projects using cppunit.
Currently I don't see a compelling reason to update for cppunit. The
decision to move to C++11 was easier and provided a clear benefit.


> I would like to create a cmake definition - do we handle that the same way?
>

Have you had a look at the feature/cmake branch?

Cheers,
Markus


> Regards,
> Florian
>
> Am 30.09.2021 um 21:56 schrieb Markus Mohrhard <
> markus.mohrh...@googlemail.com>:
>
> 
> Hey Florian,
>
> On Fri, Oct 1, 2021 at 1:52 AM Markus Mohrhard <
> markus.mohrh...@googlemail.com> wrote:
>
>> Hey Florian,
>>
>> On Tue, Sep 28, 2021 at 5:59 PM Florian Becker  wrote:
>>
>>> Hello,
>>>
>>> i have patched the libcppunit 1.15.1 to modernize and use clang flags
>>> with highest flag settings. Hopefully you can integrate this patch
>>> inside master. https://github.com/VXAPPS/cppunit/tree/feature-modernize
>>>
>>> If you have suggestions, please let me know.
>>>
>>
>> I'll have a look during the next few days and will let you know if I have
>> any questions or comments
>>
>
> Thanks for your patches. The summary is:
>
> * first patch was used without modifications
> * second patch was split up into smaller commits:
>* add [[noreturn]]
>* add override annotations
>* switch from throw to noexcept
>* remove semicolons
>* a complete removal of the old casting macros by me instead of your
> addition to the portability header
>* replace 0 with nullptr
>* disable a few simple compiler warnings
>
> I have not yet taken the size_t changes as that part contains some bugs. I
> have already fixed one but want to have a second look and think about
> whether this is how we want to solve this problem.
> I also had to remove all references to [[deprecated]] in this change as
> [[deprecated]] is only C++14 and at least for now cppunit is still at C++11.
>
> * I'll have to think a bit about the third and fourth patch. If I merge
> them I'll let you know.
>
> You can find the full code that I have pushed at:
>
> https://git.libreoffice.org/cppunit/+log/refs/heads/master
>
> Cheers,
> Markus
>
>
>
>> Cheers,
>> Markus
>>
>>
>>> Regards,
>>> Florian
>>>
>>>

Re: cppunit Patch feature-modernize

[Florian Becker]

Hi Markus,

thanks a lot.

Is there a list of compiler, which are supported? Also, is there any reason, 
why cppunit cannot upgrade to c++17?

I would like to create a cmake definition - do we handle that the same way?

Regards,
Florian

> Am 30.09.2021 um 21:56 schrieb Markus Mohrhard 
> :
> 
> 
> Hey Florian,
> 
>> On Fri, Oct 1, 2021 at 1:52 AM Markus Mohrhard 
>>  wrote:
>> Hey Florian,
>> 
>>> On Tue, Sep 28, 2021 at 5:59 PM Florian Becker  wrote:
>>> Hello,
>>> 
>>> i have patched the libcppunit 1.15.1 to modernize and use clang flags 
>>> with highest flag settings. Hopefully you can integrate this patch 
>>> inside master. https://github.com/VXAPPS/cppunit/tree/feature-modernize
>>> 
>>> If you have suggestions, please let me know.
>> 
>> I'll have a look during the next few days and will let you know if I have 
>> any questions or comments
> 
> Thanks for your patches. The summary is:
> 
> * first patch was used without modifications
> * second patch was split up into smaller commits:
>* add [[noreturn]]
>* add override annotations
>* switch from throw to noexcept
>* remove semicolons
>* a complete removal of the old casting macros by me instead of your 
> addition to the portability header
>* replace 0 with nullptr
>* disable a few simple compiler warnings
> 
> I have not yet taken the size_t changes as that part contains some bugs. I 
> have already fixed one but want to have a second look and think about whether 
> this is how we want to solve this problem.
> I also had to remove all references to [[deprecated]] in this change as 
> [[deprecated]] is only C++14 and at least for now cppunit is still at C++11.
> 
> * I'll have to think a bit about the third and fourth patch. If I merge them 
> I'll let you know.
> 
> You can find the full code that I have pushed at:
> 
> https://git.libreoffice.org/cppunit/+log/refs/heads/master
> 
> Cheers,
> Markus
> 
> 
>> 
>> Cheers,
>> Markus
>> 
>>> 
>>> Regards,
>>> Florian
>>> 


smime.p7s
Description: S/MIME cryptographic signature

Re: cppunit Patch feature-modernize

[Markus Mohrhard]

Hey Florian,

On Fri, Oct 1, 2021 at 1:52 AM Markus Mohrhard <
markus.mohrh...@googlemail.com> wrote:

> Hey Florian,
>
> On Tue, Sep 28, 2021 at 5:59 PM Florian Becker  wrote:
>
>> Hello,
>>
>> i have patched the libcppunit 1.15.1 to modernize and use clang flags
>> with highest flag settings. Hopefully you can integrate this patch
>> inside master. https://github.com/VXAPPS/cppunit/tree/feature-modernize
>>
>> If you have suggestions, please let me know.
>>
>
> I'll have a look during the next few days and will let you know if I have
> any questions or comments
>

Thanks for your patches. The summary is:

* first patch was used without modifications
* second patch was split up into smaller commits:
   * add [[noreturn]]
   * add override annotations
   * switch from throw to noexcept
   * remove semicolons
   * a complete removal of the old casting macros by me instead of your
addition to the portability header
   * replace 0 with nullptr
   * disable a few simple compiler warnings

I have not yet taken the size_t changes as that part contains some bugs. I
have already fixed one but want to have a second look and think about
whether this is how we want to solve this problem.
I also had to remove all references to [[deprecated]] in this change as
[[deprecated]] is only C++14 and at least for now cppunit is still at C++11.

* I'll have to think a bit about the third and fourth patch. If I merge
them I'll let you know.

You can find the full code that I have pushed at:

https://git.libreoffice.org/cppunit/+log/refs/heads/master

Cheers,
Markus



> Cheers,
> Markus
>
>
>> Regards,
>> Florian
>>
>>

[Libreoffice-commits] cppunit.git: 12 commits - configure.ac examples/ClockerPlugIn examples/cppunittest examples/DumperPlugIn include/cppunit NEWS src/cppunit src/DllPlugInTester

[Libreoffice Gerrit user]

 NEWS|   12 ++
 configure.ac|2 
 examples/ClockerPlugIn/ClockerPlugIn.cpp|6 -
 examples/DumperPlugIn/DumperPlugIn.cpp  |2 
 examples/cppunittest/MockFunctor.h  |2 
 examples/cppunittest/MockTestCase.cpp   |4 
 examples/cppunittest/MockTestListener.cpp   |4 
 examples/cppunittest/TrackedTestCase.cpp|   14 +-
 include/cppunit/Asserter.h  |   82 
 include/cppunit/BriefTestProgressListener.h |8 -
 include/cppunit/CompilerOutputter.h |4 
 include/cppunit/Exception.h |4 
 include/cppunit/Message.h   |2 
 include/cppunit/Portability.h   |   15 --
 include/cppunit/SynchronizedObject.h|2 
 include/cppunit/Test.h  |8 -
 include/cppunit/TestCase.h  |6 -
 include/cppunit/TestComposite.h |8 -
 include/cppunit/TestFixture.h   |6 -
 include/cppunit/TestLeaf.h  |6 -
 include/cppunit/TestListener.h  |8 -
 include/cppunit/TestPath.h  |   10 -
 include/cppunit/TestResult.h|4 
 include/cppunit/TestResultCollector.h   |   10 -
 include/cppunit/TestRunner.h|8 -
 include/cppunit/TestSuccessListener.h   |6 -
 include/cppunit/TestSuite.h |8 -
 include/cppunit/TextOutputter.h |4 
 include/cppunit/TextTestProgressListener.h  |8 -
 include/cppunit/TextTestResult.h|4 
 include/cppunit/XmlOutputter.h  |6 -
 include/cppunit/config/config-msvc6.h   |3 
 include/cppunit/extensions/RepeatedTest.h   |4 
 include/cppunit/extensions/TestCaseDecorator.h  |   10 -
 include/cppunit/extensions/TestDecorator.h  |   12 +-
 include/cppunit/extensions/TestFactoryRegistry.h|4 
 include/cppunit/extensions/TestSetUp.h  |2 
 include/cppunit/extensions/TestSuiteBuilderContext.h|4 
 include/cppunit/plugin/DynamicLibraryManager.h  |8 -
 include/cppunit/plugin/DynamicLibraryManagerException.h |6 -
 include/cppunit/plugin/PlugInManager.h  |2 
 include/cppunit/plugin/TestPlugInDefaultImpl.h  |   14 +-
 include/cppunit/portability/Stream.h|2 
 include/cppunit/tools/XmlElement.h  |4 
 include/cppunit/ui/text/TextTestRunner.h|6 -
 src/DllPlugInTester/CommandLineParserTest.cpp   |   24 ++--
 src/cppunit/Asserter.cpp|   24 ++--
 src/cppunit/DefaultProtector.h  |2 
 src/cppunit/DynamicLibraryManager.cpp   |   11 --
 src/cppunit/DynamicLibraryManagerException.cpp  |2 
 src/cppunit/Exception.cpp   |6 -
 src/cppunit/PlugInManager.cpp   |2 
 src/cppunit/ProtectorChain.cpp  |2 
 src/cppunit/ProtectorChain.h|4 
 src/cppunit/SynchronizedObject.cpp  |2 
 src/cppunit/Test.cpp|8 -
 src/cppunit/TestCase.cpp|2 
 src/cppunit/TestFactoryRegistry.cpp |2 
 src/cppunit/TestFailure.cpp |2 
 src/cppunit/TestLeaf.cpp|2 
 src/cppunit/TypeInfoHelper.cpp  |4 
 src/cppunit/Win32DynamicLibraryManager.cpp  |6 -
 src/cppunit/XmlElement.cpp  |1 
 63 files changed, 223 insertions(+), 237 deletions(-)

New commits:
commit d7049a6dd98ef12f0949f3ccfbc8ff4dbd63df2e
Author: Markus Mohrhard 
AuthorDate: Fri Oct 1 03:14:16 2021 +0800
Commit: Markus Mohrhard 
CommitDate: Fri Oct 1 03:14:16 2021 +0800

add initial NEWS entries for 1.15.2

diff --git a/NEWS b/NEWS
index 10520c2..9de7602 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+  New in CppUnit 1.15.2:
+  -
+
+* Portability:
+
+  - Use more C++11 features and remove old and deprecated
+C++ language features
+
+  - Fix a few compiler warnings
+
   New in CppUnit 1.15.1:
   -
 
commit ae6bffb6caa0e68c6b3c85d4409141084cae84f5
Author: Markus Mohrhard 
AuthorDate: Fri Oct 1 03:13:56 2021 +0800
Commit: Markus Mohrhard 
CommitDate: Fri Oct 1 03:13:56 2021 +0800

fix

Re: cppunit Patch feature-modernize

[Markus Mohrhard]

Hey Florian,

On Tue, Sep 28, 2021 at 5:59 PM Florian Becker  wrote:

> Hello,
>
> i have patched the libcppunit 1.15.1 to modernize and use clang flags
> with highest flag settings. Hopefully you can integrate this patch
> inside master. https://github.com/VXAPPS/cppunit/tree/feature-modernize
>
> If you have suggestions, please let me know.
>

I'll have a look during the next few days and will let you know if I have
any questions or comments

Cheers,
Markus


> Regards,
> Florian
>
>

Re: cppunit Patch feature-modernize

[Miklos Vajna]

Hi Florian,

On Mon, Sep 27, 2021 at 05:27:56PM +, Florian Becker  
wrote:
> i have patched the libcppunit 1.15.1 to modernize and use clang flags 
> with highest flag settings. Hopefully you can integrate this patch 
> inside master. https://github.com/VXAPPS/cppunit/tree/feature-modernize
> 
> If you have suggestions, please let me know.

CC Markus, I'm not sure if he still follows the LO dev list actively.

Regards,

Miklos

cppunit Patch feature-modernize

[Florian Becker]

Hello,

i have patched the libcppunit 1.15.1 to modernize and use clang flags 
with highest flag settings. Hopefully you can integrate this patch 
inside master. https://github.com/VXAPPS/cppunit/tree/feature-modernize

If you have suggestions, please let me know.

Regards,
Florian

[Libreoffice-commits] core.git: configure.ac external/breakpad external/coinmp external/cppunit external/lcms2 external/postgresql external/python3

[Hossein (via logerrit)]

 configure.ac  |  109 --
 external/breakpad/ExternalProject_breakpad.mk |1 
 external/coinmp/ExternalProject_coinmp.mk |1 
 external/cppunit/ExternalProject_cppunit.mk   |1 
 external/lcms2/ExternalProject_lcms2.mk   |1 
 external/postgresql/ExternalProject_postgresql.mk |1 
 external/python3/ExternalProject_python3.mk   |1 
 7 files changed, 47 insertions(+), 68 deletions(-)

New commits:
commit c156a8c708f74dd31e1ef024edc578c3915619cb
Author: Hossein 
AuthorDate: Wed Sep 15 10:08:43 2021 +0200
Commit: Mike Kaganski 
CommitDate: Thu Sep 16 19:50:56 2021 +0200

Add preliminary VS 2022 support

This patch changes the configure.ac, so that LibreOffice compiles
with the latest VS 2022 preview.

The option --with-visual-studio=2022 should be added to the
autogen.input, in order to use VS 2022 preview.

Change-Id: Ia1d9bbeabbbd44ffe82af3624151b69d36c0a45c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122133
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/configure.ac b/configure.ac
index 4af48fc034d7..0a2d098b252c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3840,6 +3840,8 @@ map_vs_year_to_version()
 case $1 in
 2019)
 vsversion=16;;
+2022)
+vsversion=17;;
 *)
 AC_MSG_ERROR([Assertion failure - invalid argument "$1" to 
map_vs_year_to_version()]);;
 esac
@@ -3931,7 +3933,7 @@ find_msvc()
 PathFormat "$vswhere"
 vswhere=$formatted_path_unix
 for ver in $vsversions; do
-vswhereoutput=`$vswhere -version "@<:@ $ver , $(expr $ver + 1) @:}@" 
-requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property 
installationPath | head -1`
+vswhereoutput=`$vswhere -prerelease -version "@<:@ $ver , $(expr $ver 
+ 1) @:}@" -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 
-property installationPath | head -1`
 # Fall back to all MS products (this includes VC++ Build Tools)
 if ! test -n "$vswhereoutput"; then
 AC_MSG_CHECKING([VC++ Build Tools and similar])
@@ -3951,6 +3953,10 @@ find_msvc()
 vcyear=2019
 vcnum=160
 ;;
+17.0)
+vcyear=2022
+vcnum=170
+;;
 esac
 vcbuildnumber=`ls $vctest/VC/Tools/MSVC -A1r | head -1`
 
@@ -4064,25 +4070,18 @@ if test "$_os" = "WINNT"; then
 AC_MSG_CHECKING([for MSBuild.exe location for: $vcnumwithdot])
 # Find the proper version of MSBuild.exe to use based on the VS version
 reg_get_value_32 
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MSBuild/$vcnumwithdot/MSBuildOverrideTasksPath
-if test -n "$regvalue" ; then
-AC_MSG_RESULT([found: $regvalue])
-MSBUILD_PATH=`win_short_path_for_make "$regvalue"`
-else
-if test "$vcnumwithdot" = "16.0"; then
-if test "$WIN_BUILD_ARCH" != "x64"; then
-regvalue="$VC_PRODUCT_DIR/../MSBuild/Current/Bin"
-else
-regvalue="$VC_PRODUCT_DIR/../MSBuild/Current/Bin/amd64"
-fi
+if test -z "$regvalue" ; then
+if test "$WIN_BUILD_ARCH" != "x64"; then
+regvalue="$VC_PRODUCT_DIR/../MSBuild/Current/Bin"
 else
-if test "$WIN_BUILD_ARCH" != "x64"; then
-regvalue="$VC_PRODUCT_DIR/../MSBuild/$vcnumwithdot/Bin"
-else
-regvalue="$VC_PRODUCT_DIR/../MSBuild/$vcnumwithdot/Bin/amd64"
-fi
+regvalue="$VC_PRODUCT_DIR/../MSBuild/Current/Bin/amd64"
 fi
+fi
+if test -d "$regvalue" ; then
 MSBUILD_PATH=`win_short_path_for_make "$regvalue"`
 AC_MSG_RESULT([$regvalue])
+else
+AC_MSG_ERROR([MSBuild.exe location not found])
 fi
 
 # Find the version of devenv.exe
@@ -4125,7 +4124,7 @@ if test "$_os" = "WINNT"; then
 # are always "better", we list them in reverse chronological order.
 
 case "$vcnum" in
-160)
+160 | 170)
 WINDOWS_SDK_ACCEPTABLE_VERSIONS="10.0 8.1A 8.1 8.0"
 ;;
 esac
@@ -6410,11 +6409,15 @@ find_msms()
 # Return value: $msmdir
 
 AC_MSG_CHECKING([for MSVC merge modules directory])
-local my_msm_files=Microsoft_VC${VCVER}_CRT_x86.msm
+local my_msm_files
 local my_msm_dir
 
+dnl Order my_msm_files in increasing order. Then check the directories 
returned
+dnl by ls in an inner loop; assuming they are also ordered in increasing 
order,
+dnl the result will be the highest MSM version found in the highest 
director

[Libreoffice-commits] core.git: Branch 'private/tvajngerl/staging' - 1280 commits - accessibility/source android/source apple_remote/source avmedia/source basctl/source basctl/uiconfig basegfx/Cppunit

[Tomaž Vajngerl (via logerrit)]

mldump.cxx
+++ b/drawinglayer/source/tools/primitive2dxmldump.cxx
@@ -156,6 +156,13 @@ void Primitive2dXmlDump::dump(
 aWriter.endDocument();
 
 pStream->Seek(STREAM_SEEK_TO_BEGIN);
+
+std::size_t nSize = pStream->remainingSize();
+std::unique_ptr pBuffer(new sal_uInt8[nSize + 1]);
+pStream->ReadBytes(pBuffer.get(), nSize);
+pBuffer[nSize] = 0;
+
+printf ("%s\n", pBuffer.get());
 }
 
 xmlDocUniquePtr Primitive2dXmlDump::dumpAndParse(
diff --git a/filter/CppunitTest_filter_pdfimporter_test.mk 
b/filter/CppunitTest_filter_pdfimporter_test.mk
new file mode 100644
index ..3b17dcdcb43f
--- /dev/null
+++ b/filter/CppunitTest_filter_pdfimporter_test.mk
@@ -0,0 +1,48 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,filter_pdfimporter_test))
+
+$(eval $(call gb_CppunitTest_use_externals,filter_pdfimporter_test,\
+   boost_headers \
+   libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,filter_pdfimporter_test, \
+filter/qa/cppunit/PdfImporterTest \
+))
+
+$(eval $(call gb_CppunitTest_use_library_objects,filter_pdfimporter_test,\
+pdfimporter \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,filter_pdfimporter_test, \
+basegfx \
+drawinglayer \
+comphelper \
+cppu \
+cppuhelper \
+sal \
+test \
+unotest \
+utl \
+tl \
+vcl \
+tk \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,filter_pdfimporter_test))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_pdfimporter_test))
+$(eval $(call gb_CppunitTest_use_ure,filter_pdfimporter_test))
+$(eval $(call gb_CppunitTest_use_vcl,filter_pdfimporter_test))
+$(eval $(call gb_CppunitTest_use_rdb,filter_pdfimporter_test,services))
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_pdfimporter.mk b/filter/Library_pdfimporter.mk
new file mode 100644
index ..93a567cbc247
--- /dev/null
+++ b/filter/Library_pdfimporter.mk
@@ -0,0 +1,35 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Library_Library,pdfimporter))
+
+$(eval $(call gb_Library_set_include,pdfimporter,\
+   -I$(SRCDIR)/filter/inc \
+   $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_use_external,pdfimporter,boost_headers))
+
+$(eval $(call gb_Library_add_exception_objects,pdfimporter,\
+   filter/source/pdfimporter/PDFImporter \
+))
+
+$(eval $(call gb_Library_use_libraries,pdfimporter,\
+   drawinglayer \
+   basegfx \
+   vcl \
+   tl \
+   sal \
+   cppu \
+   tk \
+))
+
+$(eval $(call gb_Library_use_sdk_api,pdfimporter))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 42a82bacf5c0..e079e523aa99 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_Module_add_targets,filter,\
Library_msfilter \
Library_odfflatxml \
Library_pdffilter \
+   Library_pdfimporter \
Library_storagefd \
Library_svgfilter \
Library_graphicfilter \
@@ -49,6 +50,7 @@ $(eval $(call gb_Module_add_check_targets,filter,\
 CppunitTest_filter_xslt \
 CppunitTest_filter_priority \
 CppunitTest_filter_msfilter \
+CppunitTest_filter_pdfimporter_test \
 CppunitTest_filter_textfilterdetect \
 ))
 
diff --git a/filter/qa/cppunit/PdfImporterTest.cxx 
b/filter/qa/cppunit/PdfImporterTest.cxx
new file mode 100644
index ..ee57b9bdbc67
--- /dev/null
+++ b/filter/qa/cppunit/PdfImporterTest.cxx
@@ -0,0 +1,173 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+class PDFImporterTest : public test::BootstrapFixture, public XmlTestTools
+{
+OUString getFullUrl(std::u16string_view sFileName)
+{
+return m_directories.getURLFromSrc(u"/filter/qa/cppunit/data/") + 
sFileName;
+}
+
+void testPath();
+void testImage();
+void testText();
+
+CPPUNIT_TEST_SUITE(PDFImporterTest);
+//CPPUNIT_

Re: 29/03/2021 Status request cppunit SOFTWARE

[Eike Rathke]

Hi ATEXIS,

On Monday, 2021-03-29 07:52:44 +, ATEXIS - ATEXIS_FR_OBSO wrote:

> Could you indicate:
> - if the software/firmware version is still supported/maintened,
> - if a new version is available…

The cppunit test framework is free open source software, please find
your answers at https://freedesktop.org/wiki/Software/cppunit/

  Eike

-- 
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

29/03/2021 Status request cppunit SOFTWARE

[ATEXIS - ATEXIS_FR_OBSO]

Dear,
We have been asked by company THALES Global Services for obsolescence 
monitoring.
The purpose of this survey is to obtain the information of obsolescence, 
support, even the documentation to perform a study of obsolescence without 
ambiguity on these softwares.
Could you indicate:
- if the software/firmware version is still supported/maintened,
- if a new version is available…

IMPORTANT: please, if possible, complete all columns
THALES Codification
Designation
Developped by
version
Maintained/Supported
YES/NO
Corrective
version
New version
Downloadable
Yes/no
free or paid software
Comment

cppunit
ForgeRock
V.1.13.2


best regards
Meignotte Delphine
ATEXIS OBSO

Service suivi d'obsolescence

LinkedIn<https://www.linkedin.com/company/atexis-france/> | 
www.atexis.com<http://www.atexis.com/>

ATEXIS
Espace Duo
ZAC des Playes - Jean Monnet Nord
83500 LA SEYNE SUR MER

Conformément au Règlement Général sur la Protection des Données (RGPD), ATEXIS 
met en œuvre des traitements de données à caractère personnel ayant différentes 
finalités. Pour en savoir plus sur le ou les traitement(s) de vos données, 
cliquez ici.
Ce message et toutes les pièces jointes sont établis à l'intention exclusive de 
ses destinataires et sont confidentiels. Si vous recevez ce message par erreur, 
merci de le détruire et d'en avertir immédiatement l'expéditeur.

The information contained in this e-mail and any attachments are intended 
solely for the addressees. If you have received this email in error, please 
contact the sender and delete the email from your system.

Diese Nachricht und allf?llige angeh?ngte Dokumente sind vertraulich und nur 
für den/die Adressaten bestimmt. Sollten Sie nicht der beabsichtigte Adressat 
sein, bitten wir den Absender zu verst?ndigen und die Information zu vernichten.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-bugs] [Bug 114843] Test runner crashes on exit when executing a CppUnit::TestCase

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=114843

--- Comment #4 from Finch. A  ---
I found this info very helpful. I have earlier asked a question regarding this.
Now its very clear as to what to do.

https://www.thatchfinder.com/directory/19676/sunnyvale-concrete-pros/

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-commits] core.git: external/cppunit

[Jan-Marek Glogowski (via logerrit)]

 external/cppunit/UnpackedTarball_cppunit.mk |1 
 external/cppunit/windows-arm64.patch.1  |  786 
 2 files changed, 787 insertions(+)

New commits:
commit 78bc57b130d9e88d3582b68e4b6c8584643dd636
Author: Jan-Marek Glogowski 
AuthorDate: Mon Aug 3 06:49:32 2020 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Thu Sep 17 08:39:00 2020 +0200

cppunit: fix Windows Arm64 build

Change-Id: I75b169362ed703bcae0720aeac0602f389435317
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102857
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/external/cppunit/UnpackedTarball_cppunit.mk 
b/external/cppunit/UnpackedTarball_cppunit.mk
index c645c2bf4db3..10063d2aa104 100644
--- a/external/cppunit/UnpackedTarball_cppunit.mk
+++ b/external/cppunit/UnpackedTarball_cppunit.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
external/cppunit/enable-win32-debug.patch \
external/cppunit/rtti.patch.0 \
external/cppunit/order.patch.0 \
+   external/cppunit/windows-arm64.patch.1 \
 ))
 ifeq ($(DISABLE_DYNLOADING),TRUE)
 $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
diff --git a/external/cppunit/windows-arm64.patch.1 
b/external/cppunit/windows-arm64.patch.1
new file mode 100644
index ..0e41fa005d81
--- /dev/null
+++ b/external/cppunit/windows-arm64.patch.1
@@ -0,0 +1,786 @@
+diff -ur cppunit-1.15.1.orig/src/cppunit/cppunit_dll.vcxproj 
cppunit-1.15.1/src/cppunit/cppunit_dll.vcxproj
+--- cppunit-1.15.1.orig/src/cppunit/cppunit_dll.vcxproj2019-11-28 
20:35:43.0 +0100
 cppunit-1.15.1/src/cppunit/cppunit_dll.vcxproj 2020-08-03 
03:04:20.181281900 +0200
+@@ -1,6 +1,10 @@
+ 
+ http://schemas.microsoft.com/developer/msbuild/2003;>
+   
++
++  Debug
++  ARM64
++
+ 
+   Debug
+   Win32
+@@ -9,6 +13,10 @@
+   Debug
+   x64
+ 
++
++  Release
++  ARM64
++
+ 
+   Release
+   Win32
+@@ -34,6 +42,11 @@
+ false
+ MultiByte
+   
++  
++DynamicLibrary
++false
++MultiByte
++  
+   
+ DynamicLibrary
+ false
+@@ -44,6 +57,11 @@
+ false
+ MultiByte
+   
++  
++DynamicLibrary
++false
++MultiByte
++  
+   
+   
+   
+@@ -55,6 +73,10 @@
+ 
+ 
+   
++  
++
++
++  
+   
+ 
+ 
+@@ -63,6 +85,10 @@
+ 
+ 
+   
++  
++
++
++  
+   
+   
+ .\DebugDll\
+@@ -76,6 +102,12 @@
+ true
+ cppunitd_dll
+   
++  
++.\DebugDll\
++.\DebugDll\
++true
++cppunitd_dll
++  
+   
+ .\ReleaseDll\
+ .\ReleaseDll\
+@@ -86,6 +116,11 @@
+ .\ReleaseDll\
+ false
+   
++  
++.\ReleaseDll\
++.\ReleaseDll\
++false
++  
+   
+ 
+   MultiThreadedDebugDLL
+@@ -180,6 +213,52 @@
+   
odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+ 
+   
++  
++
++  MultiThreadedDebugDLL
++  Default
++  false
++  Disabled
++  true
++  Level3
++  true
++  
..\..\include;%(AdditionalIncludeDirectories)
++  
WIN32;_DEBUG;_WINDOWS;_USRDLL;CPPUNIT_BUILD_DLL;%(PreprocessorDefinitions)
++  .\DebugDll\
++  
.\DebugDll\cppunit_dll.pch
++  .\DebugDll\
++  .\DebugDll\
++  EnableFastChecks
++
++
++  copy "$(TargetPath)" ..\..\lib\$(TargetName).dll
++copy "$(TargetDir)$(TargetName).lib" ..\..\lib\$(TargetName).lib
++  Copying target to lib/
++
++
++  true
++  
_DEBUG;%(PreprocessorDefinitions)
++  .\DebugDll\cppunit_dll.tlb
++  true
++
++
++  0x040c
++  
_DEBUG;%(PreprocessorDefinitions)
++
++
++  true
++  .\DebugDll\cppunit_dll.bsc
++
++
++  true
++  true
++  true
++  Console
++  DebugDll\cppunitd_dll.dll
++  .\DebugDll\cppunitd_dll.lib
++  
odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
++
++  
+   
+ 
+   MultiThreadedDLL
+@@ -267,6 +345,52 @@
+   true
+   true
+   true
++  Console
++  .\ReleaseDll\cppunit_dll.dll
++  .\ReleaseDll\cppunit_dll.lib
++  
odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
++
++  
++  
++
++  MultiThreadedDLL
++  OnlyExplicitInline
++  true
++  true
++  MaxSpeed
++  true
++  Level3
++  true
++  
..\..\include;%(AdditionalIncludeDirectories)
++  
WIN32;NDEBUG;_WINDOWS;_USRDLL;CPPUNIT_BUILD_DLL;%(PreprocessorDefinitions)
++  .\ReleaseDll\
++  
.\ReleaseDll\cppunit_dll.pch
++  .\ReleaseDll\
++  .\ReleaseDll\
++
++
++  copy "$(TargetPath)" ..\..\lib\$(TargetName).dll
++copy "$(TargetDir)$(TargetName).lib" ..\..\lib\$(TargetName).lib
++  Copying target to lib/
++
++
++  true
++  
NDEBUG;%(PreprocessorDefinitions)
++  .\ReleaseDll\cppunit_dll.tlb
++  true
++
++
++  0x040c
++  
NDEBUG;%(PreprocessorDefinitions)
++  

[Libreoffice-commits] core.git: external/cppunit external/curl external/lcms2 external/python3 RepositoryExternal.mk solenv/gbuild

[Jan-Marek Glogowski (via logerrit)]

 RepositoryExternal.mk   |2 +-
 external/cppunit/ExternalProject_cppunit.mk |4 ++--
 external/curl/ExternalPackage_curl.mk   |2 +-
 external/curl/ExternalProject_curl.mk   |2 +-
 external/lcms2/ExternalProject_lcms2.mk |4 +---
 external/python3/ExternalProject_python3.mk |   10 +-
 solenv/gbuild/platform/windows.mk   |   10 ++
 7 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 63cf188ce0a47ddc162c4e4207a35d4d22f2662e
Author: Jan-Marek Glogowski 
AuthorDate: Tue Sep 15 07:45:22 2020 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Tue Sep 15 08:42:54 2020 +0200

WIN add and apply default msbuild platform+config

Adds three Windows gb_* variables:

- gb_MSBUILD_CONFIG_AND_PLATFORM can be passed as msbuild flags
- gb_MSBUILD_PLATFORM maps debug / release settings
- gb_MSBUILD_CONFIG maps the CPUTYPE to the default msbuild names

and converts the users in external projects.

Change-Id: Ie9b817721180d78d104db11c44241e4b3e46bba9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102701
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 1f0a91de142a..d396cc5b5190 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2748,7 +2748,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call gb_UnpackedTarball_get_dir,curl)/builds/libcurl-vc12-$(if 
$(filter X86_64,$(CPUNAME)),x64,x86)-$(if 
$(MSVC_USE_DEBUG_RUNTIME),debug,release)-dll-ipv6-sspi-winssl/lib/libcurl$(if 
$(MSVC_USE_DEBUG_RUNTIME),_debug).lib \
+   $(call 
gb_UnpackedTarball_get_dir,curl)/builds/libcurl-vc12-$(gb_MSBUILD_PLATFORM)-$(gb_MSBUILD_CONFIG)-dll-ipv6-sspi-winssl/lib/libcurl$(if
 $(MSVC_USE_DEBUG_RUNTIME),_debug).lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
diff --git a/external/cppunit/ExternalProject_cppunit.mk 
b/external/cppunit/ExternalProject_cppunit.mk
index 9b4a69c627e1..1c5ac725af59 100644
--- a/external/cppunit/ExternalProject_cppunit.mk
+++ b/external/cppunit/ExternalProject_cppunit.mk
@@ -17,8 +17,8 @@ ifeq ($(OS),WNT)
 $(call gb_ExternalProject_get_state_target,cppunit,build) :
$(call gb_Trace_StartRange,cppunit,EXTERNAL)
$(call gb_ExternalProject_run,build,\
-   PROFILEFLAGS="$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
-   /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \
+   PROFILEFLAGS="$(gb_MSBUILD_CONFIG) \
+   /p:Platform=$(gb_MSBUILD_PLATFORM) \
$(if $(filter 160,$(VCVER)),/p:PlatformToolset=v142 
/p:VisualStudioVersion=16.0 /ToolsVersion:Current) \
$(if $(filter 
10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))" \
&& msbuild.exe cppunit_dll.vcxproj 
/p:Configuration=$${PROFILEFLAGS}  \
diff --git a/external/curl/ExternalPackage_curl.mk 
b/external/curl/ExternalPackage_curl.mk
index 8da569e3e0cf..79a89a24a52c 100644
--- a/external/curl/ExternalPackage_curl.mk
+++ b/external/curl/ExternalPackage_curl.mk
@@ -14,7 +14,7 @@ $(eval $(call 
gb_ExternalPackage_use_external_project,curl,curl))
 ifneq ($(DISABLE_DYNLOADING),TRUE)
 
 ifeq ($(COM),MSC)
-$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl$(if 
$(MSVC_USE_DEBUG_RUNTIME),_debug).dll,builds/libcurl-vc12-$(if $(filter 
X86_64,$(CPUNAME)),x64,x86)-$(if 
$(MSVC_USE_DEBUG_RUNTIME),debug,release)-dll-ipv6-sspi-winssl/bin/libcurl$(if 
$(MSVC_USE_DEBUG_RUNTIME),_debug).dll))
+$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl$(if 
$(MSVC_USE_DEBUG_RUNTIME),_debug).dll,builds/libcurl-vc12-$(gb_MSBUILD_PLATFORM)-$(gb_MSBUILD_CONFIG)-dll-ipv6-sspi-winssl/bin/libcurl$(if
 $(MSVC_USE_DEBUG_RUNTIME),_debug).dll))
 else ifeq ($(OS),MACOSX)
 $(eval $(call 
gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.4.dylib,lib/.libs/libcurl.4.dylib))
 else ifeq ($(OS),AIX)
diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index f6eb073f5d39..138b50afd0e0 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -81,7 +81,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
nmake -f Makefile.vc \
mode=dll \
VC=12 \
-   $(if $(filter 
X86_64,$(CPUNAME)),MACHINE=x64,MACHINE=x86) \
+   MACHINE=$(gb_MSBUILD_PLATFORM) \
GEN_PDB=$(if $(call 
gb_Module__symbols_enabled,curl),yes,no) \
DEBUG=$(if $(MSVC_USE_DEBUG_RUNTIME),yes,no) \
ENABLE_IPV6=yes \
diff --git a/external/lcms2/ExternalProject_lcms2.mk 
b/external/lcms2/ExternalProject_lcms2.mk
index 6c30d6958f89..4bed4a5b705d 100644
--- a/external/lcms2/E

[Libreoffice-bugs] [Bug 136629] cppunit are not functioning

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=136629

rsprupansh...@gmail.com changed:

   What|Removed |Added

 Resolution|--- |WONTFIX
 Status|NEW |RESOLVED

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 136629] cppunit are not functioning

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=136629

rsprupansh...@gmail.com changed:

   What|Removed |Added

 Ever confirmed|0   |1
 Status|UNCONFIRMED |NEW

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 136629] New: cppunit are not functioning

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=136629

Bug ID: 136629
   Summary: cppunit are not functioning
   Product: cppunit
   Version: unspecified
  Hardware: PowerPC
OS: Mac OS X (All)
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: General
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: rsprupansh...@gmail.com
CC: markus.mohrh...@googlemail.com

steps to reproduce


expected


actaul



screenshot

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 132584] Building cppunit with/for Visual Studio 2017/2019

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=132584

QA Administrators  changed:

   What|Removed |Added

 Whiteboard| QA:needsComment|

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 132584] Building cppunit with/for Visual Studio 2017/2019

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=132584

Sasha  changed:

   What|Removed |Added

 Ever confirmed|0   |1
 Status|UNCONFIRMED |NEW

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 132584] Building cppunit with/for Visual Studio 2017/2019

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=132584

--- Comment #1 from Sasha  ---
IIUC, 'src/CppUnitLibraries2010.sln' is present in git (e.g. when I do 'git
clone') but missing in tar.gz archives (e.g. available here
https://freedesktop.org/wiki/Software/cppunit/#releaseversions).

Looks like an archive-packaging bug for me.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-commits] cppunit.git: Changes to 'refs/tags/cppunit-1.15.0'

[Libreoffice Gerrit user]

Tag 'cppunit-1.15.0' created by Andras Timar  at 
2020-08-25 09:22 +

cppunit-1.15.0

Changes since cppunit-1.14.0-21:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] cppunit.git: Changes to 'refs/tags/cppunit-1.15.1'

[Libreoffice Gerrit user]

Tag 'cppunit-1.15.1' created by Andras Timar  at 
2020-08-25 09:19 +

cppunit-1.15.1

Changes since cppunit-1.14.0-27:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/cppunit

[Stephan Bergmann (via logerrit)]

 external/cppunit/UnpackedTarball_cppunit.mk |1 +
 external/cppunit/order.patch.0  |   25 +
 2 files changed, 26 insertions(+)

New commits:
commit 2f2246d22e2a8ccbc1dc3e6f5243734a61edf270
Author: Stephan Bergmann 
AuthorDate: Sat Aug 8 12:00:23 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Sat Aug 8 14:18:54 2020 +0200

external/cppunit: Run tests in deterministic order

What prompted me to make this change is that when I tried an --enable-lto 
build,
CppunitTest_xmlsecurity_signing failed in a non-obvious way, and I noticed 
that
it ran the individual tests in a different order than a --disable-lto build.

With this change, CppunitTest_xmlsecurity_signing also started to fail in 
the
--disable-lto build, which has meanwhile been fixed with
800eebfa82106c509310ed43bef38a7a4ad4451f "Database document apparently 
needs to
be closed before it is disposed".  No other tests started to fail in my
Linux --disable-lto-build with this change, and my Linux --enable-lto build
(using recent Fedora 32 GCC 10.2 and the default linker) also succeeds `make
check` after 800eebfa82106c509310ed43bef38a7a4ad4451f, both with and without
this cppunit change.
(<https://bugs.documentfoundation.org/show_bug.cgi?id=126442> "LTO build
segfaults in sw_apitests" and 
<https://src.fedoraproject.org/rpms/libreoffice/c/
5d644f1606b76ffa4a102433849a824d7293a404> "%check fails with lto enabled"
indicate that older branches also fail CppunitTest_sw_apitests with
--enable-lto, but I could not reproduce that on current master.)

What happens in cppunit is that every CPPUNIT_TEST_SUITE_REGISTRATION (or 
other
macro like CPPUNIT_TEST_FIXTURE internally calling
CPPUNIT_TEST_SUITE_REGISTRATION) creates a global static variable whose ctor
inserts the address of a sub-object of that global static variable into the
TestFactoryRegistry::m_factories set.  Even if the order of invocation of 
those
ctors from one .cxx is deterministic, the relative order or the addresses of
those sub-objects inserted into the TestFactoryRegistry::m_factories set 
need
not be (though they probably typically are).  Another source of 
nondeterminism
is that the order of ctors from different .cxx is not specified (which might
have caused the CppunitTest_xmlsecurity_signing failures, given that test
includes suites from two different .cxx).

So to make test execution more reproducible, make the order in which the 
tests
are run deterministic, sorting them by name.  (When
TestFactoryRegistry::addTestToSuite the adds the sorted tests to
TestSuite::addTest, they are inserted into a TestSuite::m_tests vector, from
which point on things appear to already happen in a deterministic order.)

Change-Id: I40741f397a96772974fd41bacdb3dd763c885417
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100384
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/cppunit/UnpackedTarball_cppunit.mk 
b/external/cppunit/UnpackedTarball_cppunit.mk
index 24f75b43415f..c645c2bf4db3 100644
--- a/external/cppunit/UnpackedTarball_cppunit.mk
+++ b/external/cppunit/UnpackedTarball_cppunit.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
external/cppunit/CPPUNIT_PLUGIN_EXPORT.patch.0 \
external/cppunit/enable-win32-debug.patch \
external/cppunit/rtti.patch.0 \
+   external/cppunit/order.patch.0 \
 ))
 ifeq ($(DISABLE_DYNLOADING),TRUE)
 $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
diff --git a/external/cppunit/order.patch.0 b/external/cppunit/order.patch.0
new file mode 100644
index ..523b3cd704e1
--- /dev/null
+++ b/external/cppunit/order.patch.0
@@ -0,0 +1,25 @@
+--- src/cppunit/TestFactoryRegistry.cpp
 src/cppunit/TestFactoryRegistry.cpp
+@@ -143,13 +143,21 @@
+ void 
+ TestFactoryRegistry::addTestToSuite( TestSuite *suite )
+ {
++  std::multimap sorted;
+   for ( Factories::iterator it = m_factories.begin(); 
+ it != m_factories.end(); 
+ ++it )
+   {
+ TestFactory *factory = *it;
+-suite->addTest( factory->makeTest() );
++Test *test = factory->makeTest();
++sorted.insert({test->getName(), test});
+   }
++  // In the unlikely case of multiple Tests with identical names, those will
++  // still be added in random order:
++  for (auto const : sorted)
++  {
++suite->addTest( i.second );
++  }
+ }
+ 
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/cppunit

[Stephan Bergmann (via logerrit)]

 external/cppunit/ExternalProject_cppunit.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1fc2e731d625611e41b6508d698f754a481ef770
Author: Stephan Bergmann 
AuthorDate: Fri Aug 7 10:54:35 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Aug 7 15:36:25 2020 +0200

external/cppunit: -g based on --enable-symbols, not --enable-debug

Change-Id: I35ceb0069082cb66f1bc09591baace594f0dc030
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100297
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/cppunit/ExternalProject_cppunit.mk 
b/external/cppunit/ExternalProject_cppunit.mk
index c0d1380645f7..9b4a69c627e1 100644
--- a/external/cppunit/ExternalProject_cppunit.mk
+++ b/external/cppunit/ExternalProject_cppunit.mk
@@ -36,7 +36,7 @@ cppunit_CXXFLAGS+=-D_GLIBCXX_DEBUG
 endif
 endif
 
-ifneq (,$(debug))
+ifneq (,$(call gb_LinkTarget__symbols_enabled,cppunit))
 cppunit_CXXFLAGS+=-g
 endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-qa] Converting a Python UI test into a cppunit test

[Michael Stahl]

On 17.07.20 08:53, Ilmari Lauhakangas wrote:

Michael Stahl kirjoitti 16.7.2020 klo 20.43:

On 16.07.20 18:55, Ilmari Lauhakangas wrote:

I created execute.sh for running the Python UI test:

export PYTHONPATH=/home/tonttu/libreoffice/instdir/program/
export 
URE_BOOTSTRAP=file:///home/tonttu/libreoffice/instdir/program/fundamentalrc 


export SAL_USE_VCLPLUGIN=gen
rm -rf /tmp/libreoffice/4
SRCDIR="${SRCDIR:-$(pwd)}"
python "$SRCDIR"/uitest/test_main.py --debug 
--soffice=path:"$SRCDIR"/instdir/program/soffice 
--userdir=file:///tmp/libreoffice/4 
--file="$SRCDIR"/sw/qa/uitest/writer_tests7/tdf127652.py


I ran execute.sh while in the core directory and confirmed that the 
UI test failed.


why so complicated, try:

(cd sw && make -srj8 UITest_writer_tests7 
UITEST_TEST_NAME="tdf127652.tdf127652.test_mark_delete_undo_delete_tdf127652") 



The script method allows to see the UI while the test is executed, but 
it would be good to have the example you quote documented in 
https://wiki.documentfoundation.org/Development/UITests#Running_the_test


oh! i wondered if this would work, and it does work for me:

(cd sw && make -srj8 UITest_writer_tests7 
UITEST_TEST_NAME="tdf127652.tdf127652.test_mark_delete_undo_delete_tdf127652" 
SAL_USE_VCLPLUGIN=gen)

___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Converting a Python UI test into a cppunit test

[Ilmari Lauhakangas]

Michael Stahl kirjoitti 16.7.2020 klo 20.43:

On 16.07.20 18:55, Ilmari Lauhakangas wrote:

I created execute.sh for running the Python UI test:

export PYTHONPATH=/home/tonttu/libreoffice/instdir/program/
export 
URE_BOOTSTRAP=file:///home/tonttu/libreoffice/instdir/program/fundamentalrc 


export SAL_USE_VCLPLUGIN=gen
rm -rf /tmp/libreoffice/4
SRCDIR="${SRCDIR:-$(pwd)}"
python "$SRCDIR"/uitest/test_main.py --debug 
--soffice=path:"$SRCDIR"/instdir/program/soffice 
--userdir=file:///tmp/libreoffice/4 
--file="$SRCDIR"/sw/qa/uitest/writer_tests7/tdf127652.py


I ran execute.sh while in the core directory and confirmed that the UI 
test failed.


why so complicated, try:

(cd sw && make -srj8 UITest_writer_tests7 
UITEST_TEST_NAME="tdf127652.tdf127652.test_mark_delete_undo_delete_tdf127652") 


The script method allows to see the UI while the test is executed, but 
it would be good to have the example you quote documented in 
https://wiki.documentfoundation.org/Development/UITests#Running_the_test


Ilmari
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Converting a Python UI test into a cppunit test

[Michael Stahl]

[oops, resending because i'm too dumb for email]

On 16.07.20 18:55, Ilmari Lauhakangas wrote:

I created execute.sh for running the Python UI test:

export PYTHONPATH=/home/tonttu/libreoffice/instdir/program/
export 
URE_BOOTSTRAP=file:///home/tonttu/libreoffice/instdir/program/fundamentalrc

export SAL_USE_VCLPLUGIN=gen
rm -rf /tmp/libreoffice/4
SRCDIR="${SRCDIR:-$(pwd)}"
python "$SRCDIR"/uitest/test_main.py --debug 
--soffice=path:"$SRCDIR"/instdir/program/soffice 
--userdir=file:///tmp/libreoffice/4 
--file="$SRCDIR"/sw/qa/uitest/writer_tests7/tdf127652.py


I ran execute.sh while in the core directory and confirmed that the UI 
test failed.


why so complicated, try:

(cd sw && make -srj8 UITest_writer_tests7 
UITEST_TEST_NAME="tdf127652.tdf127652.test_mark_delete_undo_delete_tdf127652")

___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-qa] Converting a Python UI test into a cppunit test

[Ilmari Lauhakangas]

We have a list of Python UI tests that should be reimplemented as 
cppunit tests:

https://wiki.documentfoundation.org/UiTestsToCppUnittests

I completed my first conversion and thought it might be useful to write 
about my experience. The conversion commit is here:

https://git.libreoffice.org/core/commit/72186f02c118e9f5602e15c2bac9b3ac19987f93

I started by temporarily undoing the fix for the bug so the crash would 
reappear and the test would fail: 
https://git.libreoffice.org/core/commit/9ec2c77046901fdacca77753052b54c81e6bc82c

sw/source/core/text/txtfrm.cxx:

assert(nLen != TextFrameIndex(COMPLETE_STRING));
if (rFrame.IsFollow() && nPos < rFrame.GetOffset())
{
rFrame.ManipOfst( std::max(TextFrameIndex(0), 
op(rFrame.GetOffset(), nLen)) );

}

I created execute.sh for running the Python UI test:

export PYTHONPATH=/home/tonttu/libreoffice/instdir/program/
export 
URE_BOOTSTRAP=file:///home/tonttu/libreoffice/instdir/program/fundamentalrc

export SAL_USE_VCLPLUGIN=gen
rm -rf /tmp/libreoffice/4
SRCDIR="${SRCDIR:-$(pwd)}"
python "$SRCDIR"/uitest/test_main.py --debug 
--soffice=path:"$SRCDIR"/instdir/program/soffice 
--userdir=file:///tmp/libreoffice/4 
--file="$SRCDIR"/sw/qa/uitest/writer_tests7/tdf127652.py


I ran execute.sh while in the core directory and confirmed that the UI 
test failed.


I copied the test document from sw/qa/uitest/writer_tests7/data to 
sw/qa/extras/uiwriter/data3


I started creating the cppunit test in sw/qa/extras/uiwriter/uiwriter3.cxx

Command for running the cppunit test:
CPPUNIT_TEST_NAME="testTdf127652" make CppunitTest_sw_uiwriter

I had no idea how to convert the Python methods for moving the cursor, 
deleting and checking the current page. For figuring things out, I had 
to do web searches against https://docs.libreoffice.org/ and to grep the 
code in sw as well as the existing Writer cppunit tests found in sw/qa


For example, hoping for the best I tried grepping 'current page' in sw/, 
found useful stuff and continued in a similar manner.


For searching I used ripgrep, but you can use whatever you feel 
comfortable with (like git grep).


Examples with ripgrep, ran in the core directory:

rg --pretty 'DelRight' sw/qa --glob '*.cxx' | less -RK
rg --pretty --ignore-case 'jumpto' sw/qa --glob '*.cxx' | less -RK

Clang-format was not happy with the old skool indentation, so it was 
fixed with:


clang-format -i sw/qa/extras/uiwriter/uiwriter3.cxx

Ilmari
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 9 commits - compilerplugins/clang connectivity/source external/python3 extras/source include/editeng include/vcl sc/source sw/Cppunit

[Serge Krot (via logerrit)]

 compilerplugins/clang/referencecasting.cxx  |3 +++
 connectivity/source/parse/sqlflex.l |4 +++-
 external/python3/python-3.7.6-msvc-ssl.patch.1  |   15 +++
 extras/source/shellnew/soffice.odg  |binary
 extras/source/shellnew/soffice.ods  |binary
 extras/source/shellnew/soffice.odt  |binary
 include/editeng/numitem.hxx |8 ++--
 include/vcl/errinf.hxx  |1 +
 sc/source/ui/app/inputhdl.cxx   |   11 +++
 sc/source/ui/view/cellsh3.cxx   |   16 ++--
 sw/CppunitTest_sw_core_doc.mk   |1 +
 sw/qa/core/doc/data/textbox-textrotateangle.odt |binary
 sw/qa/core/doc/doc.cxx  |   22 ++
 sw/source/core/doc/number.cxx   |4 ++--
 sw/source/core/doc/textboxhelper.cxx|   14 --
 sw/source/core/unocore/unosett.cxx  |7 ---
 sw/source/filter/ww8/wrtw8num.cxx   |2 +-
 sw/source/ui/dbui/mmresultdialogs.cxx   |4 +++-
 sw/source/uibase/dbui/dbmgr.cxx |3 ++-
 toolkit/source/controls/stdtabcontroller.cxx|   16 +---
 vcl/source/window/errinf.cxx|6 ++
 winaccessibility/source/UAccCOM/MAccessible.cxx |4 
 22 files changed, 115 insertions(+), 26 deletions(-)

New commits:
commit 2631f65a9b64c86456f9083e282f7f05af82fca1
Author: Serge Krot 
AuthorDate: Fri May 22 13:20:23 2020 +0200
Commit: Michael Meeks 
CommitDate: Sat Jun 6 09:33:00 2020 +0100

tdf#133270 MAILMERGE progress is not updated during export of many files

See also https://gerrit.libreoffice.org/c/core/+/90686 for a similar
change.

Change-Id: I063394f7ef0a68c79366f09c9d2cf5775a57e640
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94663
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 80cea3682b2cf07f1685852cd8809d9db58a1cb5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95481
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx 
b/sw/source/ui/dbui/mmresultdialogs.cxx
index 53a76b8eb2bb..9d507f204ce9 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -45,6 +45,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -664,7 +665,8 @@ IMPL_LINK_NOARG(SwMMResultSaveDialog, SaveOutputHdl_Impl, 
weld::Button&, void)
 while(true)
 {
 //time for other slots is needed
-Application::Reschedule( true );
+Scheduler::ProcessEventsToIdle();
+
 bool bFailed = false;
 try
 {
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 0b28c048bffb..2daa67893592 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -45,6 +45,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1436,7 +1437,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
 //TODO xProgressDlg->queue_draw();
 }
 
-Application::Reschedule( true );
+Scheduler::ProcessEventsToIdle();
 
 // Create a copy of the source document and work with that one 
instead of the source.
 // If we're not in the single file mode (which requires 
modifying the document for the merging),
commit a3bba79435537982445d7ce0a8fa9f4c3450b49f
Author: Jan-Marek Glogowski 
AuthorDate: Fri Jan 24 13:33:37 2020 +
Commit: Michael Meeks 
CommitDate: Sat Jun 6 09:32:54 2020 +0100

python3+WIN: don't fail copy of openssl DLLs+PDBs

The LO python3 target fails for me on Windows with:
  
C:\lode\dev\core\workdir\UnpackedTarball\python3\PCBuild\openssl.props(24,5):
error MSB3030: Datei 
"C:/lode/dev/core/workdir/UnpackedTarball/openssl/out32dll\libcrypto-1_1.dll"
konnte nicht kopiert werden, da die Datei nicht gefunden wurde.
[C:\lode\dev\core\workdir\UnpackedTarball\python3\PCBuild\_ssl.vcxproj]

Same for
  "C:/lode/dev/core/workdir/UnpackedTarball/openssl/out32dll\libssl-1_1.pdb"
  
"C:/lode/dev/core/workdir/UnpackedTarball/openssl/out32dll\libcrypto-1_1.pdb"
  "C:/lode/dev/core/workdir/UnpackedTarball/openssl/out32dll\libssl-1_1.dll"

Other files were also renamed in a previous hunk of this patch.

For other people these failures are silently ignored, but they
show up in their python3 build.log. But my msbuild version
15.9.21+g9802d43bc3 from VS2017 fails hard on these errors.

So this just adapt the pdb and dll names to match the previous
renames, which passes the copy calls, so the build continues.

[Libreoffice-bugs] [Bug 132584] Building cppunit with/for Visual Studio 2017/2019

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=132584

QA Administrators  changed:

   What|Removed |Added

 Whiteboard|| QA:needsComment

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 132584] New: Building cppunit with/for Visual Studio 2017/2019

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=132584

Bug ID: 132584
   Summary: Building cppunit with/for Visual Studio 2017/2019
   Product: cppunit
   Version: unspecified
  Hardware: All
OS: Windows (All)
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: General
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: jaroslav.imr...@gmail.com
CC: markus.mohrh...@googlemail.com

Hello,

I'd like to build the latest cppunit 1.15.1 with/for Visual Studio 2017/2019
and I'm little lost since all Visual Studio projects have been removed and
instructions in `INSTALL-WIN32.txt` file have not been updated accordingly.

FYI the latest version I was able to build successfully was cppunit 1.13.2 and
I have written down my process at
https://github.com/disig/SoftHSM2-for-Windows/blob/2.5.0/BUILDING.md#build-cppunit-1132-unicode-library

So the real question here is: Does cppunit 1.15.1 still support building
with/for Visual Studio 2017/2019?

It would be great if someone more familiar with cppunit project than me could
update instructions in `INSTALL-WIN32.txt` file.

Thanks a lot.

Regards, Jaroslav

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

Re: CMake Support for Cppunit

[julien2412]

Hello Adrian,

I may be wrong but Cmake isn't a target for LO.
Meson had been quoted (see
https://wiki.documentfoundation.org/Development/GSoC/Ideas#Feasibility_study:_building_LibreOffice_using_meson).

Anyway, if you want to contribute, I advise you to start here:
https://wiki.documentfoundation.org/Development/GetInvolved

Since you already retrieved the code, built it and patched it, you only have
to:
- send an email about license statement
- create a gerrit account
- submit the patch with your gerrit account.

Julien



--
Sent from: 
http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: CMake Support for Cppunit

[Ilmari Lauhakangas]

julien2412 kirjoitti 18.4.2020 klo 9.33:

Hello Adrian,

I may be wrong but Cmake isn't a target for LO.
Meson had been quoted (see
https://wiki.documentfoundation.org/Development/GSoC/Ideas#Feasibility_study:_building_LibreOffice_using_meson).

Anyway, if you want to contribute, I advise you to start here:
https://wiki.documentfoundation.org/Development/GetInvolved

Since you already retrieved the code, built it and patched it, you only have
to:
- send an email about license statement
- create a gerrit account
- submit the patch with your gerrit account.


Adrian is proposing the patch for cppunit project itself, but indeed the 
patch should be sent to gerrit cppunit repo.


https://wiki.documentfoundation.org/Development/gerrit

Ilmari
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

CMake Support for Cppunit

[Adrian Ostrowski]

Hi Guys,

Long story short, I prepared you a patch that would add CMake support to
your project. You can find it attached.

I tried using CppUnit in my CMake projects but it was not that pleasant. I
then found the https://github.com/Ultimaker/CppUnit repo which added
support for CMake, so I started using that instead. After adding a few
small fixes, I decided to upstream those changes, so here they are.

CMake is the most popular build system (generator) for C++ projects, so I
hope it will help with the adoption of your testing framework.

Please review the patch and if merge it if there are no issues.

Best Regards,
Adrian Ostrowski


0001-Add-CMake-support.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: cppunit

[Markus Mohrhard]

Hey David,


On Sun, Mar 29, 2020 at 8:29 AM David Wiseman  wrote:

> Hi,
>
>As a developer, if make a contribution to the cppunit project, is it
> just required that it builds, or are there tests that I should run.  And I
> guess I would contribute to the test suite also.   Can you tell me if there
> is a review procedure for contributions?
>


make check needs to pass.

The code will need to be pushed to gerrit, our reviewing platform, where it
will be reviewed and finally pushed.

Cheers,
Markus

>
>
> Thanks,
>
> David
> Please see our Privacy Policy (https://www.iee.lu/en/privacy-policy) to
> learn how we handle personal data. This e-mail may contain trade secrets or
> privileged, undisclosed or otherwise confidential information. If you are
> not the intended recipient and have received this e-mail in error, you are
> hereby notified that any review, copying or distribution of it is strictly
> prohibited. Please inform us immediately and destroy the original
> transmittal from your system. Thank you for your co-operation.
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

cppunit

[David Wiseman]

Hi,
   As a developer, if make a contribution to the cppunit project, is it just 
required that it builds, or are there tests that I should run.  And I guess I 
would contribute to the test suite also.   Can you tell me if there is a review 
procedure for contributions?

Thanks,
David
Please see our Privacy Policy (https://www.iee.lu/en/privacy-policy) to learn 
how we handle personal data. This e-mail may contain trade secrets or 
privileged, undisclosed or otherwise confidential information. If you are not 
the intended recipient and have received this e-mail in error, you are hereby 
notified that any review, copying or distribution of it is strictly prohibited. 
Please inform us immediately and destroy the original transmittal from your 
system. Thank you for your co-operation.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: configure.ac external/coinmp external/cppunit external/lcms2 external/python3 README.md

[Stephan Bergmann (via logerrit)]

 README.md   |2 -
 configure.ac|   52 +++-
 external/coinmp/ExternalProject_coinmp.mk   |1 
 external/cppunit/ExternalProject_cppunit.mk |1 
 external/lcms2/ExternalProject_lcms2.mk |1 
 external/python3/ExternalProject_python3.mk |1 
 6 files changed, 14 insertions(+), 44 deletions(-)

New commits:
commit 24973523ba59087185d434396fd614e73d72107f
Author: Stephan Bergmann 
AuthorDate: Fri Feb 28 11:11:18 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Mar 4 18:33:21 2020 +0100

Bump Windows build baseline to Visual Studio 2019 16.4

(where 16.4 is currently the latest version of Visual Studio 2019 available 
at
<https://visualstudio.microsoft.com/downloads/>), see

<https://lists.freedesktop.org/archives/libreoffice/2020-February/084575.html>
"ESC meeting minutes: 2020-02-27": "Update baseline to VS2019 on master 
before
7.0 [...] check what’s the current patch level, require that? [...] no
objections"

The code from 4ea0059bca6dd84f10abcf52f6d6b81c1afec397 "VS detection: 
Fallback
to old registry check if vswhere failed" has been removed in accordance 
with its
comment "The below hack does not work for VS 2019 anyway, so should be 
removed
when upgrading baseline.

(Changing the comment "go to Start menu, open 'Visual Studio 2017', [...]"
regarding the installation of GNU Make from source is somewhat arbitrary, 
but
lets stick to the tradition of bumping that version number along with any 
build
baseline bump.)

Change-Id: Ic4fe8a3d347aa1748377f2d3205e302bff189b79
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89699
Reviewed-by: Christian Lohmaier 
Tested-by: Jenkins

diff --git a/README.md b/README.md
index 87de8f4baee4..4ed3b80b2fec 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ run and compile LibreOffice, also used by the TDF builds:
 
 * Windows:
 * Runtime: Windows 7
-* Build: Cygwin + Visual Studio 2017 version 15.7
+* Build: Cygwin + Visual Studio 2019 version 16.4
 * macOS:
 * Runtime: 10.10
 * Build: 10.14.4 + Xcode 11.3
diff --git a/configure.ac b/configure.ac
index 3cf459ae7526..d896b12c8a6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2101,9 +2101,9 @@ libo_FUZZ_ARG_WITH(doxygen,
 ,with_doxygen=yes)
 
 AC_ARG_WITH(visual-studio,
-AS_HELP_STRING([--with-visual-studio=<2017/2019>],
+AS_HELP_STRING([--with-visual-studio=<2019>],
 [Specify which Visual Studio version to use in case several are
- installed. Currently only 2017 (default) and 2019 are supported.]),
+ installed. Currently only 2019 (default) is supported.]),
 ,)
 
 AC_ARG_WITH(windows-sdk,
@@ -3295,8 +3295,6 @@ map_vs_year_to_version()
 unset vsversion
 
 case $1 in
-2017)
-vsversion=15;;
 2019)
 vsversion=16;;
 *)
@@ -3315,8 +3313,8 @@ vs_versions_to_check()
 map_vs_year_to_version "$1"
 vsversions=$vsversion
 else
-# We accept only 2017
-vsversions="15"
+# We accept only 2019
+vsversions="16"
 fi
 }
 
@@ -3368,7 +3366,7 @@ find_ucrt()
 
 find_msvc()
 {
-# Find Visual C++ 2017/2019
+# Find Visual C++ 2019
 # Args: $1 (optional) : The VS version year
 # Return values: $vctest, $vcyear, $vcnum, $vcnumwithdot, $vcbuildnumber
 
@@ -3393,33 +3391,9 @@ find_msvc()
 fi
 done
 
-# This fallback is needed on *some* (but not all) VS 2017 installations, 
where vswhere turns up
-# with the empty list for unclear reason. The below hack does not work for 
VS 2019 anyway, so
-# should be removed when upgrading baseline.
-if ! test -n "$vctest"; then
-for ver in $vsversions; do
-reg_get_value_32 
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver.0/Setup/VC/ProductDir
-if test -n "$regvalue"; then
-vctest=$regvalue
-break
-fi
-reg_get_value_32 
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/SxS/VS7/$ver.0
-if test -n "$regvalue"; then
-AC_MSG_RESULT([found: $regvalue])
-PathFormat "$regvalue"
-vctest=$formatted_path
-break
-fi
-done
-fi
-
 if test -n "$vctest"; then
 vcnumwithdot="$ver.0"
 case "$vcnumwithdot" in
-15.0)
-vcyear=2017
-vcnum=150
-;;
 16.0)
 vcyear=2019
 vcnum=160
@@ -3440,7 +3414,7 @@ if test "$_os" = "WINNT"; then
 if test -n "$with_visual_studio"; then
 AC_MSG_ERROR([no Visual Studio $with_visual_studio installat

Re: Cppunit 1.15.0 and Cppunit 1.15.1 aren't tagged in GIT repo

[Markus Mohrhard]

Hey,

On Mon, Feb 17, 2020 at 7:51 PM Christian Madsen 
wrote:

> The two mentioned versions aren’t tagged in the git://
> anongit.freedesktop.org/git/libreoffice/cppunit/ repository.
>
>
>
> The last tagged version is cppunit-1.14.0.
>

they are at least tagged in the pushed version at
https://gerrit.libreoffice.org/plugins/gitiles/cppunit

I'll need to check why the sync between the repos is not updating the tags.
For now if you need the tags best to use the gerrit version and I'll try to
figure out why our repository replication is not syncing the tags anymore.

Cheers,
Markus

>
>
> Kind Regards,
>
> Christian Madsen
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Cppunit 1.15.0 and Cppunit 1.15.1 aren't tagged in GIT repo

[Christian Madsen]

The two mentioned versions aren't tagged in the 
git://anongit.freedesktop.org/git/libreoffice/cppunit/ repository.

The last tagged version is cppunit-1.14.0.

Kind Regards,
Christian Madsen
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

cppunit updated to 1.15.1 with new features

[Markus Mohrhard]

Hey,

I just updated cppunit to 1.15.1 in master which includes at least two new
features for LibreOffice:

* Noel's patch to allow custom string formatter to allow e.g. OUString in
the CPPUNIT_ASSERT_MESSAGE message part (
https://cgit.freedesktop.org/libreoffice/cppunit/commit/?id=1caa3a0c66f009fe1a386d7559dc25054dad42a3
)
* Miklos' patch to add CPPUNIT_TEST_FIXTURE which allows us to remove the
corresponding LibreOffice patch

If you find any issues please let me know.

Cheers,
Markus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: download.lst external/cppunit

[Markus Mohrhard (via logerrit)]

 download.lst|4 
 external/cppunit/0001-Unconditionally-use-C-11-noreturn.patch.1 |   57 
--
 external/cppunit/UnpackedTarball_cppunit.mk |6 -
 external/cppunit/gcc9.patch.0   |   11 -
 external/cppunit/windows.patch  |   12 +-
 5 files changed, 9 insertions(+), 81 deletions(-)

New commits:
commit ffe9ff2cf63112ac04a695740a5637f25c16abe8
Author: Markus Mohrhard 
AuthorDate: Fri Dec 20 01:28:54 2019 +0800
Commit: Markus Mohrhard 
CommitDate: Tue Dec 24 20:45:53 2019 +0100

update cppunit to 1.15.1

Change-Id: Ic27a77addb409a8d63ea44136a8d2410ee40c4d2
Reviewed-on: https://gerrit.libreoffice.org/85539
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/download.lst b/download.lst
index fdd0b866c373..690f43cc419d 100644
--- a/download.lst
+++ b/download.lst
@@ -25,8 +25,8 @@ export LIBCMIS_SHA256SUM := 
d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d874
 export LIBCMIS_TARBALL := libcmis-0.5.2.tar.xz
 export COINMP_SHA256SUM := 
86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f
 export COINMP_TARBALL := CoinMP-1.7.6.tgz
-export CPPUNIT_SHA256SUM := 
3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780
-export CPPUNIT_TARBALL := cppunit-1.14.0.tar.gz
+export CPPUNIT_SHA256SUM := 
89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7
+export CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
 export CT2N_SHA256SUM := 
71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3
 export CT2N_TARBALL := 
1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
 export CURL_SHA256SUM := 
7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd
diff --git a/external/cppunit/0001-Unconditionally-use-C-11-noreturn.patch.1 
b/external/cppunit/0001-Unconditionally-use-C-11-noreturn.patch.1
deleted file mode 100644
index 70ede229a3e6..
--- a/external/cppunit/0001-Unconditionally-use-C-11-noreturn.patch.1
+++ /dev/null
@@ -1,57 +0,0 @@
-From c955b1041b9e3ebe7ee8a620340b78bddc820682 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann 
-Date: Fri, 1 Feb 2019 13:37:59 +0100
-Subject: [PATCH] Unconditionally use C++11 [[noreturn]]
-
-This helps avoid issues like <https://gerrit.libreoffice.org/plugins/gitiles/
-core/+/9808486a89c6368f836579f8d8c0dda63fd0063c%5E%21> "Avoid
--Werror,-Wimplicit-fallthrough with clang-cl ...where CPPUNIT_FAIL is marked as
-noreturn only for __GNUC__".
-
-Change-Id: Idb33af7375f103f2dd7a7b4c3dbf20ce731b17ad

- include/cppunit/Asserter.h | 12 +++-
- 1 file changed, 3 insertions(+), 9 deletions(-)
-
-diff --git a/include/cppunit/Asserter.h b/include/cppunit/Asserter.h
-index 3321b87..dd39ead 100644
 a/include/cppunit/Asserter.h
-+++ b/include/cppunit/Asserter.h
-@@ -43,23 +43,17 @@ class Message;
-  * \endcode
-  */
- 
--#if defined __GNUC__
--#   define NORETURN __attribute__((noreturn))
--#else
--#   define NORETURN
--#endif
--
- struct Asserter
- {
-   /*! \brief Throws a Exception with the specified message and location.
-*/
--  NORETURN static void CPPUNIT_API fail( const Message , 
-+  [[noreturn]] static void CPPUNIT_API fail( const Message , 
- const SourceLine  = SourceLine() );
- 
-   /*! \brief Throws a Exception with the specified message and location.
-* \deprecated Use fail( Message, SourceLine ) instead.
-*/
--  NORETURN static void CPPUNIT_API fail( std::string message, 
-+  [[noreturn]] static void CPPUNIT_API fail( std::string message, 
- const SourceLine  = SourceLine() );
- 
-   /*! \brief Throws a Exception with the specified message and location.
-@@ -165,7 +159,7 @@ struct Asserter
-*  what are the differences between the expected 
and actual value.
-* \param shortDescription Short description for the failure message.
-*/
--  NORETURN static void CPPUNIT_API failNotEqual( std::string expected, 
-+  [[noreturn]] static void CPPUNIT_API failNotEqual( std::string expected, 
- std::string actual, 
- const SourceLine ,
- const AdditionalMessage 
 = AdditionalMessage(),
--- 
-2.20.1
-
diff --git a/external/cppunit/UnpackedTarball_cppunit.mk 
b/external/cppunit/UnpackedTarball_cppunit.mk
index 649ba8fc4063..24f75b43415f 100644
--- a/external/cppunit/UnpackedTarball_cppunit.mk
+++ b/external/cppunit/UnpackedTarball_cppunit.mk
@@ -13,18 +13,12 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,cppunit,$(CPPUNIT_TARBALL),,cppunit
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,cppunit))
 
-# gcc9.patch.0 addressed upstream with <https://gerrit.libreoffice.org/58690> 
"Avoid GCC 9
-#  -Wdeprecated-copy":
-# 0001-Unconditionally-use-C-11-nore

[Libreoffice-commits] cppunit.git: 3 commits - configure.ac include/cppunit NEWS

[Libreoffice Gerrit user]

 NEWS |   21 +++
 configure.ac |2 -
 include/cppunit/extensions/TestSuiteBuilderContext.h |4 +--
 3 files changed, 24 insertions(+), 3 deletions(-)

New commits:
commit 81cbaa728f595aa25819206dca6f71338686ad9e
Author: Markus Mohrhard 
AuthorDate: Sat Dec 21 02:56:17 2019 +0800
Commit: Markus Mohrhard 
CommitDate: Sat Dec 21 02:56:17 2019 +0800

next version is going to be 1.15.1

diff --git a/configure.ac b/configure.ac
index 21e3249..18a9966 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ([2.65])
 # 
 m4_define([cppunit_version_major],[1])
 m4_define([cppunit_version_minor],[15])
-m4_define([cppunit_version_micro],[0])
+m4_define([cppunit_version_micro],[1])
 
m4_define([cppunit_version],[cppunit_version_major.cppunit_version_minor.cppunit_version_micro])
 m4_define([cppunit_interface_age], [0])
 m4_define([cppunit_binary_age], [0])
commit 8ed8126ec0c9ddd95c2d86ef81a95f6b405e05af
Author: Markus Mohrhard 
AuthorDate: Sat Dec 21 02:55:41 2019 +0800
Commit: Markus Mohrhard 
CommitDate: Sat Dec 21 02:55:41 2019 +0800

add NEWS for 1.15.0 and 1.15.1

diff --git a/NEWS b/NEWS
index f8ef782..88d06bd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,24 @@
+  New in CppUnit 1.15.0:
+  -
+
+* Portability:
+
+  - Fix Wdefaulted-function-deleted warning with clang
+
+  New in CppUnit 1.15.0:
+  -
+
+  - Report (un)signed character as intergers
+
+  - add CPPUNIT_TEST_FIXTURE()
+
+  - add message_to_string trait to allow custom string formatters
+
+* Portability:
+  - Fix build with gcc 9
+
+  - Fix various compiler warnings
+
   New in CppUnit 1.14.0:
   -
 
commit 834f3a287387bd6230c98b0c5375aff568c75e02
Author: Markus Mohrhard 
AuthorDate: Sat Dec 21 02:44:08 2019 +0800
Commit: Markus Mohrhard 
CommitDate: Sat Dec 21 02:44:08 2019 +0800

fix -Wdefaulted-function-deleted error

diff --git a/include/cppunit/extensions/TestSuiteBuilderContext.h 
b/include/cppunit/extensions/TestSuiteBuilderContext.h
index 12d157e..04f4b9b 100644
--- a/include/cppunit/extensions/TestSuiteBuilderContext.h
+++ b/include/cppunit/extensions/TestSuiteBuilderContext.h
@@ -42,8 +42,8 @@ public:
 
   TestSuiteBuilderContextBase(TestSuiteBuilderContextBase const &) = default;
   TestSuiteBuilderContextBase(TestSuiteBuilderContextBase &&) = default;
-  TestSuiteBuilderContextBase & operator =(TestSuiteBuilderContextBase const 
&) = default;
-  TestSuiteBuilderContextBase & operator =(TestSuiteBuilderContextBase &&) = 
default;
+  TestSuiteBuilderContextBase & operator =(TestSuiteBuilderContextBase const 
&) = delete;
+  TestSuiteBuilderContextBase & operator =(TestSuiteBuilderContextBase &&) = 
delete;
 
   /*! \brief Adds a test to the fixture suite.
*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: error linking Cppunit test

[Miklos Vajna]

Hi,

Could you send a short, self-contained example that allows reproducing
the problem?

Regards,

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

error linking Cppunit test

[Dave Clark]

Hello;

I'm not sure this is the correct forum for this question; if not, my 
apologies.


I'm getting the following error when I attempt to link a Cppunit test.  
Does anyone have any idea why?


build/Debug/GNU-Linux/tests/tests/Test.o:(.rodata._ZTIN7CppUnit17AdditionalMessageE[_ZTIN7CppUnit17AdditionalMessageE]+0x10): 
*undefined reference to `typeinfo for CppUnit::Message'*


*Thank you.
*

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-2' - 17 commits - avmedia/source cui/source dbaccess/source dbaccess/uiconfig filter/source .gitreview include/vcl sc/source sw/Cppunit

[Samuel Mehrbrodt (via logerrit)]

 .gitreview |2 
 avmedia/source/gstreamer/gstplayer.cxx |   24 --
 cui/source/customize/SvxMenuConfigPage.cxx |   10 ++
 dbaccess/source/core/misc/dsntypes.cxx |9 +-
 dbaccess/uiconfig/ui/textconnectionsettings.ui |1 
 filter/source/msfilter/msdffimp.cxx|9 ++
 include/vcl/graphicfilter.hxx  |2 
 sc/source/core/tool/compiler.cxx   |9 +-
 sw/CppunitTest_sw_ww8import.mk |   30 
 sw/inc/unosett.hxx |2 
 sw/qa/extras/ww8import/data/tdf125281.doc  |binary
 sw/qa/extras/ww8import/ww8import.cxx   |   26 +++
 sw/source/core/text/porfld.cxx |4 -
 sw/source/core/text/porfld.hxx |1 
 sw/source/core/text/txtfld.cxx |   12 +++
 sw/source/core/unocore/unosett.cxx |   15 +++-
 sw/source/uibase/config/StoredChapterNumbering.cxx |2 
 vcl/Library_vcl.mk |1 
 vcl/Library_vclplug_qt5.mk |2 
 vcl/headless/svpvd.cxx |   10 ++
 vcl/inc/headless/svpvd.hxx |5 +
 vcl/inc/impgraph.hxx   |2 
 vcl/inc/qt5/Qt5Frame.hxx   |   23 +++---
 vcl/inc/qt5/Qt5SvpGraphics.hxx |   46 +
 vcl/inc/qt5/Qt5SvpSurface.hxx  |   46 +
 vcl/inc/salobj.hxx |7 +-
 vcl/inc/unx/gtk/gtkframe.hxx   |2 
 vcl/qt5/Qt5Clipboard.cxx   |   37 ++
 vcl/qt5/Qt5Frame.cxx   |   52 --
 vcl/qt5/Qt5Menu.cxx|4 -
 vcl/qt5/Qt5SvpGraphics.cxx |   52 ++
 vcl/qt5/Qt5SvpSurface.cxx  |   73 +
 vcl/qt5/Qt5Widget.cxx  |2 
 vcl/source/filter/graphicfilter.cxx|5 -
 vcl/source/gdi/impgraph.cxx|   42 +++-
 vcl/source/window/bufferdevice.cxx |   36 ++
 vcl/source/window/bufferdevice.hxx |   36 ++
 vcl/source/window/menubarwindow.cxx|   11 ---
 vcl/source/window/menufloatingwindow.cxx   |9 --
 vcl/source/window/syschild.cxx |6 +
 vcl/unx/gtk3/gtk3gtkframe.cxx  |   13 +--
 vcl/unx/kde5/KDE5SalFrame.cxx  |4 -
 vcl/unx/kde5/KDE5SalGraphics.cxx   |2 
 vcl/unx/kde5/KDE5SalGraphics.hxx   |3 
 vcl/unx/kde5/KDE5SalInstance.cxx   |   18 -
 vcl/unx/kde5/KDE5SalInstance.hxx   |4 +
 vcl/unx/kde5/KDE5SalVirtualDevice.hxx  |   36 ++
 47 files changed, 596 insertions(+), 151 deletions(-)

New commits:
commit e09e5274910d3eec6fee078edbcfe5e4ae273a4a
Author: Samuel Mehrbrodt 
AuthorDate: Thu Jul 4 14:51:34 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Thu Jul 4 16:13:37 2019 +0200

gitreview: Update default branch

Change-Id: I7c7a1968b0dd1b326f543d52a36012d8c2fd05c2

diff --git a/.gitreview b/.gitreview
index b6f0665a9ba6..62c07bc1f29e 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@ host=logerrit
 port=29418
 project=core
 defaultremote=logerrit
-defaultbranch=libreoffice-6-2
+defaultbranch=distro/cib/libreoffice-6-2
 
commit 4ca3ac84912ab387b27d3f6c1a288a1ba12eb730
Author: Eike Rathke 
AuthorDate: Thu Jun 13 20:25:49 2019 +0200
Commit: Michael Weghorn 
CommitDate: Fri Jun 14 07:51:17 2019 +0200

Resolves: tdf#113541 handle external reference in Excel syntax

... not only OOXML. This wasn't only a problem when creating a
reference by clicking or travelling to a cell in the external
document, but also when editing an external reference in Excel_A1
or Excel_R1C1 reference syntax.

Change-Id: Iee3d529ff9834e5013a61c2056238277f33356fe
Reviewed-on: https://gerrit.libreoffice.org/73979
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 69903b5c5f9b9015c88931c0eb8a47b52ea3de12)
Reviewed-on: https://gerrit.libreoffice.org/73988
Reviewed-by: Michael Weghorn 

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 7ed3845f967e..edb4f9fadb0b 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2125,11 +2125,14 @@ Label_MaskStateMachine:
 }
 else if( nMask & ScCharFlags::Char )
 {
-// '[' is a special case in OOXML, it can start an external
-// reference ID like [1]Sheet1!A1 that needs to be scanned
+// 

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 9 commits - cui/source cui/uiconfig desktop/qa desktop/source include/svl include/unotools officecfg/registry sfx2/source svl/Cppunit

[Tamás Zolnai (via logerrit)]

 cui/source/options/optfltr.cxx |   10 
 cui/source/options/optfltr.hxx |1 
 cui/uiconfig/ui/optfltrembedpage.ui|   63 +
 desktop/qa/desktop_app/test_desktop_app.cxx|   23 
 desktop/source/app/cmdlineargs.cxx |   10 
 include/svl/documentlockfile.hxx   |   39 
 include/svl/lockfilecommon.hxx |   21 
 include/svl/msodocumentlockfile.hxx|   86 +
 include/svl/sharecontrolfile.hxx   |2 
 include/unotools/fltrcfg.hxx   |3 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |8 
 sfx2/source/doc/docfile.cxx|  132 +-
 sfx2/source/doc/objstor.cxx|   14 
 svl/CppunitTest_svl_lockfiles.mk   |   52 
 svl/Library_svl.mk |3 
 svl/Module_svl.mk  |1 
 svl/qa/unit/lockfiles/test_lockfiles.cxx   |  712 +
 svl/source/misc/documentlockfile.cxx   |  140 +-
 svl/source/misc/lockfilecommon.cxx |   37 
 svl/source/misc/msodocumentlockfile.cxx|  263 
 svl/source/misc/sharecontrolfile.cxx   |6 
 sw/source/core/layout/fly.cxx  |5 
 sw/source/ui/config/optcomp.cxx|   26 
 sw/source/uibase/docvw/FloatingTableButton.cxx |9 
 sw/source/uibase/docvw/FrameControlsManager.cxx|4 
 sw/source/uibase/inc/FloatingTableButton.hxx   |4 
 sw/source/uibase/inc/FrameControlsManager.hxx  |2 
 unotools/source/config/fltrcfg.cxx |   27 
 28 files changed, 1497 insertions(+), 206 deletions(-)

New commits:
commit 82c7ecc4852a6ff39343a43f91c410bd72d2b702
Author: Tamás Zolnai 
AuthorDate: Sun Apr 28 15:21:39 2019 +0200
Commit: Tamás Zolnai 
CommitDate: Thu Jun 20 14:23:21 2019 +0200

WebDav: Don't unlock the file during saving of a document

Otherwise it can happen that the file is locked by someone
else during the saving method is running.
I just extended the scope of the existing DisableUnlockWebDAV()
calls a bit. In case of webdav it does not cause an issue to
avoid unlocking the file before locking it again with an other
SfxMedium.

Change-Id: I6ac4e3326c63c9e184a7710ce8994cac1ed79449
Reviewed-on: https://gerrit.libreoffice.org/71484
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai 
(cherry picked from commit fdab153636ad7e3ce4b09836a63d2fa11b42e728)

diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 61e94cfc1c94..59293e3e9cb1 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -1187,6 +1187,10 @@ bool SfxObjectShell::SaveTo_Impl
   && !rMedium.GetName().equalsIgnoreAsciiCase("private:stream")
   && ::utl::UCBContentHelper::EqualURLs( pMedium->GetName(), 
rMedium.GetName() ) )
 {
+// Do not unlock the file during saving.
+// need to modify this for WebDAV if this method is called outside of
+// the process of saving a file
+pMedium->DisableUnlockWebDAV();
 bStoreToSameLocation = true;
 
 if ( pMedium->DocNeedsFileDateCheck() )
@@ -1287,6 +1291,7 @@ bool SfxObjectShell::SaveTo_Impl
 }
 }
 }
+pMedium->DisableUnlockWebDAV(false);
 }
 else
 {
@@ -1706,10 +1711,6 @@ bool SfxObjectShell::SaveTo_Impl
 return bOk;
 }
 
-
-// This method contains a call to disable the UNLOCK of a WebDAV resource, 
that work while saving a file.
-// If the method is called from another process (e.g. not when saving a file),
-// that disabling needs tweaking
 bool SfxObjectShell::DisconnectStorage_Impl( SfxMedium& rSrcMedium, SfxMedium& 
rTargetMedium )
 {
 // this method disconnects the storage from source medium, and attaches it 
to the backup created by the target medium
@@ -1730,12 +1731,7 @@ bool SfxObjectShell::DisconnectStorage_Impl( SfxMedium& 
rSrcMedium, SfxMedium& r
 rTargetMedium.ResetError();
 xOptStorage->writeAndAttachToStream( uno::Reference< 
io::XStream >() );
 rSrcMedium.CanDisposeStorage_Impl( false );
-// need to modify this for WebDAV if this method is called 
outside
-// the process of saving a file
-rSrcMedium.DisableUnlockWebDAV();
 rSrcMedium.Close();
-// see comment on the previous third row
-rSrcMedium.DisableUnlockWebDAV( false );
 
 // now try to create the backup
 rTargetMedium.GetBackup_Impl();
commit 

Re: CppUnit SdMiscTest::testTdf119956 Failing on Windows with 150% scale factor

[Jan-Marek Glogowski]

Am 21. Mai 2019 00:48:40 MESZ schrieb Regina Henschel :
>I get curious results.
>
>If I run the single test using
>/opt/lo/bin/make CppunitTest_sd_misc_tests 
>CPPUNIT_TEST_NAME="testTdf119956" CPPUNITTRACE=TRUE
>or
>/opt/lo/bin/make CppunitTest_sd_misc_tests
>CPPUNIT_TEST_NAME="testTdf119956"
>
>it does _not_ fail.
>
>If I run the test among other tests using
>$ /opt/lo/bin/make sd.check
>it fails.
>
...
>
>But that does not explain, why the test works here as single test and 
>not in the series of tests.

There is a general problem with LO unit tests: a test may change the state of 
the application, which eventually influences the next test. Some stuff is 
cached.
In theory you would have to restart LO for each test to reset any internal 
state, but that would be very slow.

The other, more probable possibility, I have also faced a few times, is memory 
corruption. This means your failing test is actually valid, but a previous test 
has passed but corrupted some memory. You should run the whole test in some 
memory checker.

Jan-Marek
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: CppUnit SdMiscTest::testTdf119956 Failing on Windows with 150% scale factor

[Regina Henschel]

Hi Luke,

I get curious results.

If I run the single test using
/opt/lo/bin/make CppunitTest_sd_misc_tests 
CPPUNIT_TEST_NAME="testTdf119956" CPPUNITTRACE=TRUE

or
/opt/lo/bin/make CppunitTest_sd_misc_tests CPPUNIT_TEST_NAME="testTdf119956"

it does _not_ fail.

If I run the test among other tests using
$ /opt/lo/bin/make sd.check
it fails.

I have tested it with Version: 6.3.0.0.alpha1+ (x64)
Build ID: 115ab48f86d4e3c6eede49767df1ee5a82b4ab22
CPU threads: 8; OS: Windows 10.0; UI render: default; VCL: win;
Locale: en-US (en_US); UI-Language: en-US
Calc: threaded

I have set Windows 10 to 150% scale factor. Larger factors make apps 
unusable on my monitor.


I do not remember, whether I had tested it with 150% at the time I wrote 
the test. In the meantime the tab bar has been changed. The tabs are 
much wider now than before. So it might be, that the tab center, that 
should get a click, is no longer visible.


If I change the window width from 1024 to 1600 in line 145 in 
SdMiscTest::Load(), then the test does not fail in 150% screen setting.


But that does not explain, why the test works here as single test and 
not in the series of tests.


Kind regards
Regina



Luke Benes schrieb am 20-May-19 um 22:30:

While testing various scaling factors for the starmath issue,
http://document-foundation-mail-archive.969070.n3.nabble.com/CppunitTest-starmath-qa-cppunit-Failing-on-Windows-with-HiDPI-screens-tp4261772.html

I discovered that  SdMiscTest::testTdf119956 is also failing.

Any ideas why this test would also be dpi dependent?

The build log is below. Would you like any additional debugging info?


-Luke

[build CUT] sd_misc_tests
SdMiscTest::testTdf67248 finished in: 1086ms
D:/core/sd/qa/unit/misc-tests.cxx:777:SdMiscTest::testTdf119956
equality assertion failed
- Expected: 3
- Actual  : 0

SdMiscTest::testTdf119956 finished in: 1851ms
SdMiscTest::testTdf120527 finished in: 500ms
D:/core/sd/qa/unit/misc-tests.cxx(777) : error : Assertion
Test name: SdMiscTest::testTdf119956
equality assertion failed
- Expected: 3
- Actual  : 0

Failures !!!
Run: 15   Failure total: 1   Failures: 1   Errors: 0

Error: a unit test failed, please do one of:
make CppunitTest_sd_misc_tests CPPUNITTRACE=TRUE # which is a shortcut for the 
following line




___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

CppUnit SdMiscTest::testTdf119956 Failing on Windows with 150% scale factor

[Luke Benes]

While testing various scaling factors for the starmath issue,
http://document-foundation-mail-archive.969070.n3.nabble.com/CppunitTest-starmath-qa-cppunit-Failing-on-Windows-with-HiDPI-screens-tp4261772.html

I discovered that  SdMiscTest::testTdf119956 is also failing. 

Any ideas why this test would also be dpi dependent? 

The build log is below. Would you like any additional debugging info?


-Luke

[build CUT] sd_misc_tests
SdMiscTest::testTdf67248 finished in: 1086ms
D:/core/sd/qa/unit/misc-tests.cxx:777:SdMiscTest::testTdf119956
equality assertion failed
- Expected: 3
- Actual  : 0

SdMiscTest::testTdf119956 finished in: 1851ms
SdMiscTest::testTdf120527 finished in: 500ms
D:/core/sd/qa/unit/misc-tests.cxx(777) : error : Assertion
Test name: SdMiscTest::testTdf119956
equality assertion failed
- Expected: 3
- Actual  : 0

Failures !!!
Run: 15   Failure total: 1   Failures: 1   Errors: 0

Error: a unit test failed, please do one of:
make CppunitTest_sd_misc_tests CPPUNITTRACE=TRUE # which is a shortcut for the 
following line

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: basic/CppunitTest_basic_macros.mk configure.ac external/coinmp external/cppunit external/lcms2 external/python3

[Tomoyuki Kubota (via logerrit)]

 basic/CppunitTest_basic_macros.mk   |2 
 configure.ac|   85 +++-
 external/coinmp/ExternalProject_coinmp.mk   |3 
 external/cppunit/ExternalProject_cppunit.mk |3 
 external/lcms2/ExternalProject_lcms2.mk |5 -
 external/python3/ExternalProject_python3.mk |3 
 6 files changed, 58 insertions(+), 43 deletions(-)

New commits:
commit f61d6474205793b0838d90b09037cef52408a4b9
Author: Tomoyuki Kubota 
AuthorDate: Fri Feb 22 15:35:39 2019 +0900
Commit: Michael Stahl 
CommitDate: Tue Apr 16 13:01:03 2019 +0200

Initial VS 2019 Support

Change-Id: I8e08efb549ebd52c37183a1185d6de73f2b00601
Reviewed-on: https://gerrit.libreoffice.org/64630
Reviewed-by: himajin10 
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/basic/CppunitTest_basic_macros.mk 
b/basic/CppunitTest_basic_macros.mk
index e86c3dae27e4..7b9aed16dfaf 100644
--- a/basic/CppunitTest_basic_macros.mk
+++ b/basic/CppunitTest_basic_macros.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_macros, \
 ifeq ($(OS),WNT)
 $(eval $(call gb_CppunitTest_use_system_win32_libs,basic_macros, \
oleaut32 \
-   $(if $(filter 150,$(VCVER)),legacy_stdio_definitions) \
+   $(if $(filter 150 160,$(VCVER)),legacy_stdio_definitions) \
odbc32 \
odbccp32 \
 ))
diff --git a/configure.ac b/configure.ac
index 2d62af9981a9..71e75103d38f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3199,7 +3199,9 @@ map_vs_year_to_version()
 
 case $1 in
 2017)
-vsversion=15.0;;
+vsversion=15;;
+2019)
+vsversion=16;;
 *)
 AC_MSG_ERROR([Assertion failure - invalid argument "$1" to 
map_vs_year_to_version()]);;
 esac
@@ -3217,7 +3219,7 @@ vs_versions_to_check()
 vsversions=$vsversion
 else
 # We accept only 2017
-vsversions="15.0"
+vsversions="15"
 fi
 }
 
@@ -3269,37 +3271,40 @@ find_ucrt()
 
 find_msvc()
 {
-# Find Visual C++ 2017
+# Find Visual C++ 2017/2019
 # Args: $1 (optional) : The VS version year
 # Return values: $vctest, $vcyear, $vcnum, $vcnumwithdot, $vcbuildnumber
 
 unset vctest vcnum vcnumwithdot vcbuildnumber
 
 vs_versions_to_check "$1"
-
+vswhere="$(perl -e 'print $ENV{"ProgramFiles(x86)"}')"
+vswhere+="\\Microsoft Visual Studio\\Installer\\vswhere.exe"
+PathFormat "$vswhere"
+vswhere=$formatted_path
 for ver in $vsversions; do
-reg_get_value_32 
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VC/ProductDir
-if test -n "$regvalue"; then
-vctest=$regvalue
-break
-fi
-reg_get_value_32 
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/SxS/VS7/$ver
-if test -n "$regvalue"; then
-AC_MSG_RESULT([found: $regvalue])
-PathFormat "$regvalue"
+vswhereoutput=`$vswhere -version "@<:@ $ver , $(expr $ver + 1) @:}@" 
-requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property 
installationPath | head -1`
+if test -n "$vswhereoutput"; then
+PathFormat "$vswhereoutput"
 vctest=$formatted_path
 break
 fi
 done
+
 if test -n "$vctest"; then
-vcnumwithdot=$ver
+vcnumwithdot="$ver.0"
 case "$vcnumwithdot" in
 15.0)
 vcyear=2017
 vcnum=150
-vcbuildnumber=`ls $vctest/VC/Tools/MSVC -A1r | head -1`
+;;
+16.0)
+vcyear=2019
+vcnum=160
 ;;
 esac
+vcbuildnumber=`ls $vctest/VC/Tools/MSVC -A1r | head -1`
+
 fi
 }
 
@@ -3308,7 +3313,6 @@ MSBUILD_PATH=
 DEVENV=
 if test "$_os" = "WINNT"; then
 AC_MSG_CHECKING([Visual C++])
-
 find_msvc "$with_visual_studio"
 if test -z "$vctest"; then
 if test -n "$with_visual_studio"; then
@@ -3367,13 +3371,21 @@ if test "$_os" = "WINNT"; then
 AC_MSG_RESULT([found: $regvalue])
 MSBUILD_PATH=`win_short_path_for_make "$regvalue"`
 else
-if test "$BITNESS_OVERRIDE" = ""; then
-regvalue="$VC_PRODUCT_DIR/../MSBuild/$vcnumwithdot/Bin"
+if test "$vcnumwithdot" = "16.0"; then
+if test "$BITNESS_OVERRIDE" = ""; then
+regvalue="$VC_PRODUCT_DIR/../MSBuild/Current/Bin"
+else
+regvalue="$VC_PRODUCT_DIR/../MSBuild/Current/Bin/amd64"
+fi
 else
-regvalue="$VC_PRODUCT_DIR/../MSBuild/$vcnumwithdot/Bin/amd64"
+if test "$BITNESS

[CppUnit] : Contribution

[PIGAT Lilian]

Hi,

 

I would like to submit a modification on CppUnit lib in order to allow the
implementation of partial template structure overloading.

 

Please let me know if you have any suggestions or questions,

 

Best regard,

 

Cordialement,

Lilian Pigat

Ingénieur d’Étude et Réalisation

 



 



0001-Add-the-possibility-to-overload-struct-for-multiples.patch
Description: Binary data


smime.p7s
Description: S/MIME cryptographic signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-bugs] [Bug 122169] Simpler cppunit tests, use CPPUNIT_TEST_FIXTURE

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=122169

Miklos Vajna  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WONTFIX

--- Comment #3 from Miklos Vajna  ---
See the comments at  from Markus and
Eike, the new style also has some issues, so doing this conversion large-scale
(in code you don't touch / maintain anyway) is not as a great idea as it
sounded. Closing as won't fix.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

Re: CppUnit updates

[Markus Mohrhard]

Hey,

On Sat, Mar 30, 2019 at 6:22 AM Andrés Maldonado 
wrote:

> Hello,
>
> I was working on EasyHack 122169
> <https://bugs.documentfoundation.org/show_bug.cgi?id=122169> and
> submitted a patch <https://gerrit.libreoffice.org/#/c/69914/> to Gerrit,
> but the Jenkins build failed because the commit
> <https://cgit.freedesktop.org/libreoffice/cppunit/commit/?id=48145587c4c2dc4f1e07d83073e136336c81ce79>
> that adds the CPPUNIT_TEST_FIXTURE macro is not yet on a released version
> of CppUnit. Would it be possible to make a cppunit-1.14.1 release ? :)
>

There won't be a 1.14.1 release. At some point I'll release 1.15 but need
more time to polish the release. Currently the plan is not to include
CPPUNIT_TEST_FIXTURE in any future releases. I have realized that
CPPUNIT_TEST_FIXTURE is not a good API for cppunit.


> I would also like to suggest to create a page with the latest
> documentation ;) (the most recent doc that i found online
> <http://cppunit.sourceforge.net/doc/lastest/index.html> is from the
> original project, for version 1.10.2)
>

There is an up-to-date set of the documentation at
https://people.freedesktop.org/~mmohrhard/cppunit/index.html

Regards,
Markus

>
> Cheers,
> Andrés Maldonado
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

CppUnit updates

[Andrés Maldonado]

Hello,

I was working on EasyHack 122169
<https://bugs.documentfoundation.org/show_bug.cgi?id=122169> and
submitted a patch <https://gerrit.libreoffice.org/#/c/69914/> to Gerrit,
but the Jenkins build failed because the commit
<https://cgit.freedesktop.org/libreoffice/cppunit/commit/?id=48145587c4c2dc4f1e07d83073e136336c81ce79>
that adds the CPPUNIT_TEST_FIXTURE macro is not yet on a released
version of CppUnit. Would it be possible to make a cppunit-1.14.1
release ? :)

I would also like to suggest to create a page with the latest
documentation ;) (the most recent doc that i found online
<http://cppunit.sourceforge.net/doc/lastest/index.html> is from the
original project, for version 1.10.2)

Cheers,
Andrés Maldonado

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-bugs] [Bug 122169] Simpler cppunit tests, use CPPUNIT_TEST_FIXTURE

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=122169

--- Comment #2 from Miklos Vajna  ---
You need to include unotest/bootstrapfixturebase.hxx if it's not already
included, that handles the missing macro for you if it's not provided by
cppunit (which is indeed the case currently, unless you have system-cppunit
installed from git).

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 122169] Simpler cppunit tests, use CPPUNIT_TEST_FIXTURE

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=122169

--- Comment #1 from Andrés Maldonado  ---
Hello, 

I looked at this EasyHack and made a patch at
https://gerrit.libreoffice.org/#/c/69914/

But the commit that adds the CPPUNIT_TEST_FIXTURE macro
(https://cgit.freedesktop.org/libreoffice/cppunit/commit/?id=48145587c4c2dc4f1e07d83073e136336c81ce79)
is not yet on a released version of CppUnit, so the Jenkins build fails :/

I'll try to contact the maintainer of CppUnit to see if he can release a
cppunit-1.14.1 version

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

Re: LibreOffice Build failed in cppunit test for complex text

[Lars Meyer]

Hi Miklos

Am 26.03.19 um 15:14 schrieb Miklos Vajna:
> Hi,
>
> On Tue, Mar 26, 2019 at 03:07:52PM +0100, Lars Meyer  
> wrote:
>> VclComplexTextTest::testKashida finished in: 14ms
>> complextext.cxx:153:Assertion
> See if commit 3189d366497419d637042c12824601590542b2f1 helps.

thanks, it works.

Kind regards,
Lars


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: LibreOffice Build failed in cppunit test for complex text

[Miklos Vajna]

Hi,

On Tue, Mar 26, 2019 at 03:07:52PM +0100, Lars Meyer  
wrote:
> VclComplexTextTest::testKashida finished in: 14ms
> complextext.cxx:153:Assertion

See if commit 3189d366497419d637042c12824601590542b2f1 helps.

Regards,

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

LibreOffice Build failed in cppunit test for complex text

[Lars Meyer]

Hello,

I tried to compile LibreOffice from a clean and current git checkout but
the build failed within the cppunit test for complex text. Here is the
error message from the shell:

[CUT] vcl_svm_test
[CUT] vcl_errorhandler
(anonymous namespace)::CanvasBitmapTest::runTest finished in: 607ms
VclComplexTextTest::testArabic finished in: 154ms
/home/lars/libregitrepos/libo2/vcl/qa/cppunit/complextext.cxx:153:VclComplexTextTest::testKashida
assertion failed
- Expression: pGlyphs

VclComplexTextTest::testKashida finished in: 14ms
complextext.cxx:153:Assertion
Test name: VclComplexTextTest::testKashida
assertion failed
- Expression: pGlyphs

Failures !!!
Run: 3   Failure total: 1   Failures: 1   Errors: 0


Is this a know issue? Is there a workaroud for this error?

Kind regards,
Lars

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-bugs] [Bug 122169] Simpler cppunit tests, use CPPUNIT_TEST_FIXTURE

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=122169

Miklos Vajna  changed:

   What|Removed |Added

   Keywords|difficultyInteresting   |difficultyBeginner

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs