diff options
| -rw-r--r-- | sc/qa/perf/scperfobj.cxx | 16 | ||||
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 2 | ||||
| -rw-r--r-- | test/source/util/xreplaceable.cxx | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sc/qa/perf/scperfobj.cxx b/sc/qa/perf/scperfobj.cxx index b30a2c28fef4..4e4e1a893383 100644 --- a/sc/qa/perf/scperfobj.cxx +++ b/sc/qa/perf/scperfobj.cxx @@ -136,7 +136,7 @@ void ScPerfObj::testSheetFindAll() uno::Reference< container::XIndexAccess > xIndex = xSearchable->findAll(xSearchDescr); - callgrindDump("testSheetFindAll-Search value"); + callgrindDump("sc:search_all_sheets_by_value"); CPPUNIT_ASSERT(xIndex.is()); @@ -158,7 +158,7 @@ void ScPerfObj::testSheetFindAll() uno::Reference< container::XIndexAccess > xIndex2 = xSearchableStyle->findAll(xSearchDescr); - callgrindDump("testSheetFindAll-Search style"); + callgrindDump("sc:search_all_sheets_by_style"); CPPUNIT_ASSERT(xIndex2.is()); @@ -194,7 +194,7 @@ void ScPerfObj::testSheetNamedRanges() { callgrindStart(); xNamedRanges->removeByName(maNameToRemove); - callgrindDump("Namedranges-removeByName"); + callgrindDump("sc:remove_named_range_by_name"); } // test addNewByName @@ -205,13 +205,13 @@ void ScPerfObj::testSheetNamedRanges() OUString aName1("single_added"); callgrindStart(); xNamedRanges->addNewByName(aName1, aContent1, aBaseAddress, nType); - callgrindDump("Namedranges-addNewByName"); + callgrindDump("sc:add_named_range_by_name"); //test AddNewFromTitles with some 1000 new named ranges table::CellRangeAddress aCellRangeAddress = table::CellRangeAddress(0,1,0,2,999); callgrindStart(); xNamedRanges->addNewFromTitles(aCellRangeAddress, sheet::Border_LEFT); - callgrindDump("Namedranges-addNewFromTitles"); + callgrindDump("sc:add_named_range_from_titles"); } @@ -229,20 +229,20 @@ void ScPerfObj::testSheets() callgrindStart(); xSheets->insertNewByName(aSheetName, 80); - callgrindDump("Sheets-insertNewByName"); + callgrindDump("sc:insert_new_sheet_by_name"); OUString aSourceSheetName = "aSheet_2"; OUString aTargetSheetName = "aCopiedSheet"; callgrindStart(); xSheets->copyByName(aSourceSheetName, aTargetSheetName, 70); - callgrindDump("Sheets-copyByName"); + callgrindDump("sc:copy_sheet_by_name"); uno::Reference< sheet::XSpreadsheets > xSheetsNameContainer (xSheets, UNO_QUERY_THROW); callgrindStart(); xSheetsNameContainer->removeByName(aSheetName); - callgrindDump("Sheets-removeByName"); + callgrindDump("sc:remove_sheet_by_name"); } diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index f5cc1dfa1ff6..01ae4d5b3fbe 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -36,7 +36,7 @@ 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 +gb_CppunitTest_VALGRINDTOOL := valgrind --tool=callgrind --dump-instr=yes --instr-atstart=no --simulate-cache=yes --dump-instr=yes --collect-bus=yes --branch-sim=yes endif # defined by platform diff --git a/test/source/util/xreplaceable.cxx b/test/source/util/xreplaceable.cxx index 598a7ddf46ec..0ecf4237d985 100644 --- a/test/source/util/xreplaceable.cxx +++ b/test/source/util/xreplaceable.cxx @@ -54,7 +54,7 @@ void XReplaceable::testReplaceAll() callgrindStart(); xReplaceable->replaceAll(uno::Reference< util::XSearchDescriptor >(xReplaceDescr, UNO_QUERY_THROW)); - callgrindDump("replaceAll"); + callgrindDump("test:replace_all"); //check that now at least one element is found xElement = xReplaceable->findFirst(xSearchDescr); |