help msvc -analyzer out wrt CPPUNIT_ASSERT
so it can code following the CPPUNIT_ASSERT doesn't need to check what condition might have failed in the assert Change-Id: Ife7e5e54b17a8316425222d2a0efd694c9467089 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167480 Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> Tested-by: Jenkins
This commit is contained in:
parent
c24db71bc5
commit
eb8f353f8b
2 changed files with 61 additions and 0 deletions
1
external/cppunit/UnpackedTarball_cppunit.mk
vendored
1
external/cppunit/UnpackedTarball_cppunit.mk
vendored
|
@ -37,6 +37,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
|
|||
external/cppunit/sprintf.patch.0 \
|
||||
external/cppunit/clang.patch.0 \
|
||||
external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1 \
|
||||
external/cppunit/help-msvc-analyzer.patch \
|
||||
))
|
||||
ifeq ($(DISABLE_DYNLOADING),TRUE)
|
||||
$(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
|
||||
|
|
60
external/cppunit/help-msvc-analyzer.patch
vendored
Normal file
60
external/cppunit/help-msvc-analyzer.patch
vendored
Normal file
|
@ -0,0 +1,60 @@
|
|||
--- misc/cppunit-1.14.0/include/cppunit/TestAssert.h
|
||||
+++ misc/build/cppunit-1.14.0/include/cppunit/TestAssert.h
|
||||
@@ -261,6 +261,13 @@
|
||||
message );
|
||||
}
|
||||
}
|
||||
+
|
||||
+#ifdef _MSC_VER
|
||||
+# define ANALYSIS_ASSUME(condition) __analysis_assume(condition)
|
||||
+#else
|
||||
+# define ANALYSIS_ASSUME(condition) static_cast<void>(0)
|
||||
+#endif
|
||||
+
|
||||
/* A set of macros which allow us to get the line number
|
||||
* and file name at the point of an error.
|
||||
* Just goes to show that preprocessors do have some
|
||||
@@ -271,15 +278,17 @@
|
||||
* \ingroup Assertions
|
||||
*/
|
||||
#define CPPUNIT_ASSERT(condition) \
|
||||
- ( CPPUNIT_NS::Asserter::failIf( !(condition), \
|
||||
+ do { ( CPPUNIT_NS::Asserter::failIf( !(condition), \
|
||||
CPPUNIT_NS::Message( "assertion failed", \
|
||||
"Expression: " #condition), \
|
||||
- CPPUNIT_SOURCELINE() ) )
|
||||
+ CPPUNIT_SOURCELINE() ) ); \
|
||||
+ ANALYSIS_ASSUME(condition); } while(0)
|
||||
#else
|
||||
#define CPPUNIT_ASSERT(condition) \
|
||||
- ( CPPUNIT_NS::Asserter::failIf( !(condition), \
|
||||
+ do { ( CPPUNIT_NS::Asserter::failIf( !(condition), \
|
||||
CPPUNIT_NS::Message( "assertion failed" ), \
|
||||
- CPPUNIT_SOURCELINE() ) )
|
||||
+ CPPUNIT_SOURCELINE() ) ); \
|
||||
+ ANALYSIS_ASSUME(condition); } while(0)
|
||||
#endif
|
||||
|
||||
/** Assertion with a user specified message.
|
||||
@@ -289,13 +298,14 @@
|
||||
* \param condition If this condition evaluates to \c false then the
|
||||
* test failed.
|
||||
*/
|
||||
-#define CPPUNIT_ASSERT_MESSAGE(message,condition) \
|
||||
- ( CPPUNIT_NS::Asserter::failIf( !(condition), \
|
||||
- CPPUNIT_NS::Message( "assertion failed", \
|
||||
- "Expression: " \
|
||||
- #condition, \
|
||||
- CPPUNIT_NS::message_to_string(message) ), \
|
||||
- CPPUNIT_SOURCELINE() ) )
|
||||
+#define CPPUNIT_ASSERT_MESSAGE(message,condition) \
|
||||
+ do { ( CPPUNIT_NS::Asserter::failIf( !(condition), \
|
||||
+ CPPUNIT_NS::Message( "assertion failed", \
|
||||
+ "Expression: " \
|
||||
+ #condition, \
|
||||
+ CPPUNIT_NS::message_to_string(message) ), \
|
||||
+ CPPUNIT_SOURCELINE() ) ); \
|
||||
+ ANALYSIS_ASSUME(condition); } while(0)
|
||||
|
||||
/** Fails with the specified message.
|
||||
* \ingroup Assertions
|
Loading…
Reference in a new issue