sc/qa/perf/scperfobj.cxx | 11 +++--------
solenv/gbuild/CppunitTest.mk | 3 +++
2 files changed, 6 insertions(+), 8 deletions(-)
New commits:
commit 934952678ba68d8137f6855aa71fa593c3158b02
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Sat Apr 16 19:05:25 2016 +0200
fix crash in perfcheck
Change-Id: I8e053f5f0c6994c44485f61f5b3dc489271b8c5f
diff --git a/sc/qa/perf/scperfobj.cxx b/sc/qa/perf/scperfobj.cxx
index 85ac792..8bc12ca 100644
--- a/sc/qa/perf/scperfobj.cxx
+++ b/sc/qa/perf/scperfobj.cxx
@@ -44,8 +44,6 @@ using namespace css::uno;
namespace sc_apitest {
-#define NUMBER_OF_TESTS 3
-
class ScPerfObj : public CalcUnoApiTest
{
public:
@@ -135,13 +133,10 @@ void ScPerfObj::setUp()
void ScPerfObj::tearDown()
{
- if (nTest == NUMBER_OF_TESTS)
+ if (mxComponent.is())
{
- if (mxComponent.is())
- {
- closeDocument(mxComponent);
- mxComponent.clear();
- }
+ closeDocument(mxComponent);
+ mxComponent.clear();
}
CalcUnoApiTest::tearDown();
}
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index b90fb7f..313d24c 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -40,6 +40,9 @@ endif
ifneq (,$(filter perfcheck,$(MAKECMDGOALS)))
$(if $(ENABLE_VALGRIND),,$(call gb_Output_error,Running performance tests with
empty $$(ENABLE_VALGRIND) does not make sense))
gb_CppunitTest_VALGRINDTOOL := valgrind --tool=callgrind --dump-instr=yes
--instr-atstart=no --simulate-cache=yes --dump-instr=yes --collect-bus=yes
--branch-sim=yes
+ifneq ($(strip $(VALGRIND_GDB)),)
+gb_CppunitTest_VALGRINDTOOL += --vgdb=yes --vgdb-error=0
+endif
endif
# defined by platform
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
