You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2015/08/30 19:09:38 UTC
svn commit: r1700140 -
/openoffice/trunk/main/sal/qa/osl/condition/osl_Condition.cxx
Author: damjan
Date: Sun Aug 30 17:09:38 2015
New Revision: 1700140
URL: http://svn.apache.org/r1700140
Log:
#i125003# generate a non-fatal test failure in the main/sal/qa/osl/condition destructor
instead of commenting out a fatal test failure.
Modified:
openoffice/trunk/main/sal/qa/osl/condition/osl_Condition.cxx
Modified: openoffice/trunk/main/sal/qa/osl/condition/osl_Condition.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/osl/condition/osl_Condition.cxx?rev=1700140&r1=1700139&r2=1700140&view=diff
==============================================================================
--- openoffice/trunk/main/sal/qa/osl/condition/osl_Condition.cxx (original)
+++ openoffice/trunk/main/sal/qa/osl/condition/osl_Condition.cxx Sun Aug 30 17:09:38 2015
@@ -97,8 +97,7 @@ public:
~ConditionThread( )
{
- // LLA: do not throw in DTors!
- // LLA: CPPUNIT_ASSERT_MESSAGE( "#ConditionThread does not shutdown properly.\n", sal_False == this -> isRunning( ) );
+ EXPECT_TRUE( sal_False == this -> isRunning( ) ) << "#ConditionThread does not shutdown properly.\n";
}
protected:
::osl::Condition& m_MyCon;