strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix crash in perfcheck

Browse source 
Change-Id: I8e053f5f0c6994c44485f61f5b3dc489271b8c5f
This commit is contained in:
Markus Mohrhard 2016-04-16 19:05:25 +02:00
parent 5b72c4ce7f
commit 934952678b
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sc/qa/perf/scperfobj.cxx
View file

@ -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();
}

3
solenv/gbuild/CppunitTest.mk
View file

@ -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