diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-03-05 21:18:52 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-03-05 21:26:30 +0100 |
| commit | ef8a6be49a7175bcfdb014dca9c3d6ec2961b4b9 (patch) | |
| tree | b0c1fc55de8a08a1358d9b9668f3f002f9d9c7da /basic | |
| parent | e141af7d7f0969cd425de8ebc852d1b91a8e5c85 (diff) | |
Do not CPPUNIT_FAIL (which throws exceptions) from a destructor
...this is a sure way to std::terminate
Change-Id: I8753b1b1d6594829ea529462aa0369e4f2f623d4
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/qa/cppunit/basic_coverage.cxx | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/basic/qa/cppunit/basic_coverage.cxx b/basic/qa/cppunit/basic_coverage.cxx index d78a28f9efc9..fefdd4e2f3ae 100644 --- a/basic/qa/cppunit/basic_coverage.cxx +++ b/basic/qa/cppunit/basic_coverage.cxx @@ -22,7 +22,6 @@ private: bool m_bError; int m_nb_tests; int m_nb_tests_ok; - int m_nb_tests_ko; int m_nb_tests_skipped; OUString m_sCurrentTest; void process_directory(OUString sDirName); @@ -65,18 +64,13 @@ Coverage::Coverage() : m_bError(false) , m_nb_tests(0) , m_nb_tests_ok(0) - , m_nb_tests_ko(0) , m_nb_tests_skipped(0) { } Coverage::~Coverage() { - fprintf(stderr,"basic coverage Summary : skipped:%d pass:%d failed:%d\n", m_nb_tests_skipped, m_nb_tests_ok, m_nb_tests_ko ); - if(m_nb_tests_ko) - { - CPPUNIT_FAIL(""); - } + fprintf(stderr,"basic coverage Summary : skipped:%d pass:%d\n", m_nb_tests_skipped, m_nb_tests_ok ); } void Coverage::test_start(OUString sFileName) @@ -87,9 +81,8 @@ void Coverage::test_start(OUString sFileName) void Coverage::test_failed() { - m_nb_tests_ko += 1; - fprintf(stderr,"%s,FAIL\n", rtl::OUStringToOString( m_sCurrentTest, RTL_TEXTENCODING_UTF8 ).getStr() ); - + CPPUNIT_FAIL( + OUStringToOString(m_sCurrentTest, RTL_TEXTENCODING_UTF8).getStr()); } void Coverage::test_success() |