diff options
6 files changed, 24 insertions, 24 deletions
diff --git a/tests/auto/selftests/expected_badxml.lightxml b/tests/auto/selftests/expected_badxml.lightxml index 244f9b3..0875a62 100644 --- a/tests/auto/selftests/expected_badxml.lightxml +++ b/tests/auto/selftests/expected_badxml.lightxml @@ -11,22 +11,22 @@ <Description><![CDATA[a message]]></Description> </Message> <Description><![CDATA[a failure]]></Description> -<BenchmarkResult metric="events" tag="end cdata ]]> text ]]> more text" value="0" iterations="1" /> +<BenchmarkResult metric="Events" tag="end cdata ]]> text ]]> more text" value="0" iterations="1" /> <Message type="qdebug" file="" line="0"> <Description><![CDATA[a message]]></Description> </Message> <Description><![CDATA[a failure]]></Description> -<BenchmarkResult metric="events" tag="quotes " text" more text" value="0" iterations="1" /> +<BenchmarkResult metric="Events" tag="quotes " text" more text" value="0" iterations="1" /> <Message type="qdebug" file="" line="0"> <Description><![CDATA[a message]]></Description> </Message> <Description><![CDATA[a failure]]></Description> -<BenchmarkResult metric="events" tag="xml close > open < tags < text" value="0" iterations="1" /> +<BenchmarkResult metric="Events" tag="xml close > open < tags < text" value="0" iterations="1" /> <Message type="qdebug" file="" line="0"> <Description><![CDATA[a message]]></Description> </Message> <Description><![CDATA[a failure]]></Description> -<BenchmarkResult metric="events" tag="all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs" value="0" iterations="1" /> +<BenchmarkResult metric="Events" tag="all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs" value="0" iterations="1" /> </Incident> </TestFunction> <TestFunction name="badMessage"> diff --git a/tests/auto/selftests/expected_badxml.xml b/tests/auto/selftests/expected_badxml.xml index 86fdd54..a33c8d2 100644 --- a/tests/auto/selftests/expected_badxml.xml +++ b/tests/auto/selftests/expected_badxml.xml @@ -16,7 +16,7 @@ <DataTag><![CDATA[end cdata ]]]><![CDATA[]> text ]]]><![CDATA[]> more text]]></DataTag> <Description><![CDATA[a failure]]></Description> </Incident> -<BenchmarkResult metric="events" tag="end cdata ]]> text ]]> more text" value="0" iterations="1" /> +<BenchmarkResult metric="Events" tag="end cdata ]]> text ]]> more text" value="0" iterations="1" /> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[quotes " text" more text]]></DataTag> <Description><![CDATA[a message]]></Description> @@ -25,7 +25,7 @@ <DataTag><![CDATA[quotes " text" more text]]></DataTag> <Description><![CDATA[a failure]]></Description> </Incident> -<BenchmarkResult metric="events" tag="quotes " text" more text" value="0" iterations="1" /> +<BenchmarkResult metric="Events" tag="quotes " text" more text" value="0" iterations="1" /> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[xml close > open < tags < text]]></DataTag> <Description><![CDATA[a message]]></Description> @@ -34,7 +34,7 @@ <DataTag><![CDATA[xml close > open < tags < text]]></DataTag> <Description><![CDATA[a failure]]></Description> </Incident> -<BenchmarkResult metric="events" tag="xml close > open < tags < text" value="0" iterations="1" /> +<BenchmarkResult metric="Events" tag="xml close > open < tags < text" value="0" iterations="1" /> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[all > " mixed ]]]><![CDATA[]> up > " in < the ]]]><![CDATA[]> hopes < of triggering "< ]]]><![CDATA[]> bugs]]></DataTag> <Description><![CDATA[a message]]></Description> @@ -43,7 +43,7 @@ <DataTag><![CDATA[all > " mixed ]]]><![CDATA[]> up > " in < the ]]]><![CDATA[]> hopes < of triggering "< ]]]><![CDATA[]> bugs]]></DataTag> <Description><![CDATA[a failure]]></Description> </Incident> -<BenchmarkResult metric="events" tag="all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs" value="0" iterations="1" /> +<BenchmarkResult metric="Events" tag="all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs" value="0" iterations="1" /> </TestFunction> <TestFunction name="badMessage"> <Message type="qdebug" file="" line="0"> diff --git a/tests/auto/selftests/expected_benchlibcallgrind.lightxml b/tests/auto/selftests/expected_benchlibcallgrind.lightxml index b47cdc4..bdc3d77 100644 --- a/tests/auto/selftests/expected_benchlibcallgrind.lightxml +++ b/tests/auto/selftests/expected_benchlibcallgrind.lightxml @@ -7,7 +7,7 @@ </TestFunction> <TestFunction name="twoHundredMillionInstructions"> <Incident type="pass" file="" line="0"> -<BenchmarkResult metric="callgrind" tag="" value="200000160" iterations="1" /> +<BenchmarkResult metric="InstructionReads" tag="" value="200000000" iterations="1" /> </Incident> </TestFunction> <TestFunction name="cleanupTestCase"> diff --git a/tests/auto/selftests/expected_benchlibcallgrind.xml b/tests/auto/selftests/expected_benchlibcallgrind.xml index 12da64f..b29b9c5 100644 --- a/tests/auto/selftests/expected_benchlibcallgrind.xml +++ b/tests/auto/selftests/expected_benchlibcallgrind.xml @@ -8,7 +8,7 @@ <Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="twoHundredMillionInstructions"> -<BenchmarkResult metric="callgrind" tag="" value="200000160" iterations="1" /> +<BenchmarkResult metric="InstructionReads" tag="" value="200000000" iterations="1" /> <Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="cleanupTestCase"> diff --git a/tests/auto/selftests/expected_benchlibeventcounter.lightxml b/tests/auto/selftests/expected_benchlibeventcounter.lightxml index 2d6b727..218f4c8 100644 --- a/tests/auto/selftests/expected_benchlibeventcounter.lightxml +++ b/tests/auto/selftests/expected_benchlibeventcounter.lightxml @@ -7,13 +7,13 @@ </TestFunction> <TestFunction name="events"> <Incident type="pass" file="" line="0"> -<BenchmarkResult metric="events" tag="0" value="0" iterations="1" /> -<BenchmarkResult metric="events" tag="1" value="1" iterations="1" /> -<BenchmarkResult metric="events" tag="10" value="10" iterations="1" /> -<BenchmarkResult metric="events" tag="100" value="100" iterations="1" /> -<BenchmarkResult metric="events" tag="500" value="500" iterations="1" /> -<BenchmarkResult metric="events" tag="5000" value="5000" iterations="1" /> -<BenchmarkResult metric="events" tag="100000" value="100000" iterations="1" /> +<BenchmarkResult metric="Events" tag="0" value="0" iterations="1" /> +<BenchmarkResult metric="Events" tag="1" value="1" iterations="1" /> +<BenchmarkResult metric="Events" tag="10" value="10" iterations="1" /> +<BenchmarkResult metric="Events" tag="100" value="100" iterations="1" /> +<BenchmarkResult metric="Events" tag="500" value="500" iterations="1" /> +<BenchmarkResult metric="Events" tag="5000" value="5000" iterations="1" /> +<BenchmarkResult metric="Events" tag="100000" value="100000" iterations="1" /> </Incident> </TestFunction> <TestFunction name="cleanupTestCase"> diff --git a/tests/auto/selftests/expected_benchlibeventcounter.xml b/tests/auto/selftests/expected_benchlibeventcounter.xml index 7fa1fdd..646cf22 100644 --- a/tests/auto/selftests/expected_benchlibeventcounter.xml +++ b/tests/auto/selftests/expected_benchlibeventcounter.xml @@ -8,13 +8,13 @@ <Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="events"> -<BenchmarkResult metric="events" tag="0" value="0" iterations="1" /> -<BenchmarkResult metric="events" tag="1" value="1" iterations="1" /> -<BenchmarkResult metric="events" tag="10" value="10" iterations="1" /> -<BenchmarkResult metric="events" tag="100" value="100" iterations="1" /> -<BenchmarkResult metric="events" tag="500" value="500" iterations="1" /> -<BenchmarkResult metric="events" tag="5000" value="5000" iterations="1" /> -<BenchmarkResult metric="events" tag="100000" value="100000" iterations="1" /> +<BenchmarkResult metric="Events" tag="0" value="0" iterations="1" /> +<BenchmarkResult metric="Events" tag="1" value="1" iterations="1" /> +<BenchmarkResult metric="Events" tag="10" value="10" iterations="1" /> +<BenchmarkResult metric="Events" tag="100" value="100" iterations="1" /> +<BenchmarkResult metric="Events" tag="500" value="500" iterations="1" /> +<BenchmarkResult metric="Events" tag="5000" value="5000" iterations="1" /> +<BenchmarkResult metric="Events" tag="100000" value="100000" iterations="1" /> <Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="cleanupTestCase"> |