From 6f12914ddfb4d69c0267b206be654c875da17426 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Thu, 13 Apr 2017 05:21:11 +0200 Subject: update cppunit to 1.14.0 Change-Id: I95fa42f4ef0580734b605df859c1660b29adb8b2 Reviewed-on: https://gerrit.libreoffice.org/36499 Tested-by: Jenkins Reviewed-by: Markus Mohrhard --- .../0001-mark-the-fails-as-no-return.patch.1 | 54 ---------------------- external/cppunit/UnpackedTarball_cppunit.mk | 3 -- external/cppunit/coverity.patch | 19 -------- external/cppunit/enable-win32-debug.patch | 4 +- external/cppunit/wundef.patch | 12 ----- 5 files changed, 2 insertions(+), 90 deletions(-) delete mode 100644 external/cppunit/0001-mark-the-fails-as-no-return.patch.1 delete mode 100644 external/cppunit/coverity.patch delete mode 100644 external/cppunit/wundef.patch (limited to 'external/cppunit') diff --git a/external/cppunit/0001-mark-the-fails-as-no-return.patch.1 b/external/cppunit/0001-mark-the-fails-as-no-return.patch.1 deleted file mode 100644 index 13961f9e3506..000000000000 --- a/external/cppunit/0001-mark-the-fails-as-no-return.patch.1 +++ /dev/null @@ -1,54 +0,0 @@ -From 059fcd2878071616cedb5116a0b2f75b5edbdbe0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Sun, 6 Jul 2014 15:34:41 +0100 -Subject: [PATCH] mark the fails as no-return - -that might help clang scan-build understand that execution won't continue after -they fail ---- - include/cppunit/Asserter.h | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/include/cppunit/Asserter.h b/include/cppunit/Asserter.h -index 94dadaa..ad981b5 100644 ---- a/include/cppunit/Asserter.h -+++ b/include/cppunit/Asserter.h -@@ -42,17 +42,24 @@ class Message; - * CPPUNIT_SOURCELINE() ) - * \endcode - */ -+ -+#if defined __GNUC__ -+# define NORETURN __attribute__((noreturn)) -+#else -+# define NORETURN -+#endif -+ - struct Asserter - { - /*! \brief Throws a Exception with the specified message and location. - */ -- static void CPPUNIT_API fail( const Message &message, -+ NORETURN static void CPPUNIT_API fail( const Message &message, - const SourceLine &sourceLine = SourceLine() ); - - /*! \brief Throws a Exception with the specified message and location. - * \deprecated Use fail( Message, SourceLine ) instead. - */ -- static void CPPUNIT_API fail( std::string message, -+ NORETURN static void CPPUNIT_API fail( std::string message, - const SourceLine &sourceLine = SourceLine() ); - - /*! \brief Throws a Exception with the specified message and location. -@@ -111,7 +118,7 @@ struct Asserter - * what are the differences between the expected and actual value. - * \param shortDescription Short description for the failure message. - */ -- static void CPPUNIT_API failNotEqual( std::string expected, -+ NORETURN static void CPPUNIT_API failNotEqual( std::string expected, - std::string actual, - const SourceLine &sourceLine, - const AdditionalMessage &additionalMessage = AdditionalMessage(), --- -1.9.3 - diff --git a/external/cppunit/UnpackedTarball_cppunit.mk b/external/cppunit/UnpackedTarball_cppunit.mk index b1264769c371..28b251e4bf5b 100644 --- a/external/cppunit/UnpackedTarball_cppunit.mk +++ b/external/cppunit/UnpackedTarball_cppunit.mk @@ -12,13 +12,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cppunit)) $(eval $(call gb_UnpackedTarball_set_tarball,cppunit,$(CPPUNIT_TARBALL),,cppunit)) $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\ - external/cppunit/coverity.patch \ external/cppunit/windows.patch \ external/cppunit/unix.patch \ - external/cppunit/wundef.patch \ external/cppunit/CPPUNIT_PLUGIN_EXPORT.patch.0 \ external/cppunit/enable-win32-debug.patch \ - external/cppunit/0001-mark-the-fails-as-no-return.patch.1 \ external/cppunit/rtti.patch.0 \ )) ifeq ($(DISABLE_DYNLOADING),TRUE) diff --git a/external/cppunit/coverity.patch b/external/cppunit/coverity.patch deleted file mode 100644 index 34c1c2990b3e..000000000000 --- a/external/cppunit/coverity.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- misc/cppunit-1.13.1/src/cppunit/Asserter.cpp -+++ misc/build/cppunit-1.13.1/src/cppunit/Asserter.cpp -@@ -6,6 +6,7 @@ - CPPUNIT_NS_BEGIN - - -+// coverity[+kill] - void - Asserter::fail( std::string message, - const SourceLine &sourceLine ) -@@ -13,7 +14,7 @@ - fail( Message( "assertion failed", message ), sourceLine ); - } - -- -+// coverity[+kill] - void - Asserter::fail( const Message &message, - const SourceLine &sourceLine ) diff --git a/external/cppunit/enable-win32-debug.patch b/external/cppunit/enable-win32-debug.patch index 661bb4b35f9c..ea50ba529356 100644 --- a/external/cppunit/enable-win32-debug.patch +++ b/external/cppunit/enable-win32-debug.patch @@ -1,5 +1,5 @@ ---- misc/cppunit-1.13.1/src/cppunit/cppunit_dll.vcxproj -+++ misc/build/cppunit-1.13.1/src/cppunit/cppunit_dll.vcxproj +--- 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 @@ true Level3 diff --git a/external/cppunit/wundef.patch b/external/cppunit/wundef.patch deleted file mode 100644 index 5f701cd702d1..000000000000 --- a/external/cppunit/wundef.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- misc/cppunit-1.13.1/include/cppunit/Portability.h 2012-09-24 19:10:36.000000000 +0200 -+++ misc/build/cppunit-1.13.1/include/cppunit/Portability.h 2013-03-18 14:23:48.880718714 +0100 -@@ -68,6 +68,9 @@ - * std::allocator. On some compilers, you may need to change this to - * std::allocator. - */ -+#ifndef CPPUNIT_STD_NEED_ALLOCATOR /* avoid -Wundef warning */ -+#define CPPUNIT_STD_NEED_ALLOCATOR 0 -+#endif - #if CPPUNIT_STD_NEED_ALLOCATOR - # if !defined(CPPUNIT_STD_ALLOCATOR) - # define CPPUNIT_STD_ALLOCATOR std::allocator -- cgit