{
/* Benchmarking: for each median iteration*/
+ bool isBenchmark = false;
int i = (QBenchmarkGlobalData::current->measurer->needsWarmupIteration()) ? -1 : 0;
QList<QBenchmarkResult> results;
if (!invokeOk)
QTestResult::addFailure("Unable to execute slot", __FILE__, __LINE__);
+ isBenchmark = QBenchmarkTestMethodData::current->isBenchmark();
+
QTestResult::finishedCurrentTestData();
invokeMethod(QTest::currentTestObject, "cleanup()");
- QTestResult::finishedCurrentTestDataCleanup();
+
+ // If the test isn't a benchmark, finalize the result after cleanup() has finished.
+ if (!isBenchmark)
+ QTestResult::finishedCurrentTestDataCleanup();
// If this test method has a benchmark, repeat until all measurements are
// acceptable.
// The QBENCHMARK macro increases the number of iterations for each run until
// this happens.
- } while (invokeOk
- && QBenchmarkTestMethodData::current->isBenchmark()
- && QBenchmarkTestMethodData::current->resultsAccepted() == false);
+ } while (invokeOk && isBenchmark
+ && QBenchmarkTestMethodData::current->resultsAccepted() == false
+ && !QTestResult::skipCurrentTest() && !QTestResult::currentTestFailed());
QBenchmarkTestMethodData::current->endDataRun();
- if (i > -1) // iteration -1 is the warmup iteration.
- results.append(QBenchmarkTestMethodData::current->result);
+ if (!QTestResult::skipCurrentTest() && !QTestResult::currentTestFailed()) {
+ if (i > -1) // iteration -1 is the warmup iteration.
+ results.append(QBenchmarkTestMethodData::current->result);
- if (QBenchmarkTestMethodData::current->isBenchmark() &&
- QBenchmarkGlobalData::current->verboseOutput) {
+ if (isBenchmark && QBenchmarkGlobalData::current->verboseOutput) {
if (i == -1) {
QTestLog::info(qPrintable(
QString::fromLatin1("warmup stage result : %1")
.arg(QBenchmarkTestMethodData::current->result.value)), 0, 0);
}
}
- } while (QBenchmarkTestMethodData::current->isBenchmark()
- && (++i < QBenchmarkGlobalData::current->adjustMedianIterationCount()));
+ }
+ } while (isBenchmark
+ && (++i < QBenchmarkGlobalData::current->adjustMedianIterationCount())
+ && !QTestResult::skipCurrentTest() && !QTestResult::currentTestFailed());
- if (QBenchmarkTestMethodData::current->isBenchmark()
- && QBenchmarkTestMethodData::current->resultsAccepted())
- QTestLog::addBenchmarkResult(qMedian(results));
+ // If the test is a benchmark, finalize the result after all iterations have finished.
+ if (isBenchmark) {
+ bool testPassed = !QTestResult::skipCurrentTest() && !QTestResult::currentTestFailed();
+ QTestResult::finishedCurrentTestDataCleanup();
+ // Only report benchmark figures if the test passed
+ if (testPassed && QBenchmarkTestMethodData::current->resultsAccepted())
+ QTestLog::addBenchmarkResult(qMedian(results));
+ }
}
/*!
QBENCHMARK {
}
- QFAIL("a failure");
+ QFETCH(bool, shouldFail);
+ if (shouldFail)
+ QFAIL("a failure");
}
void tst_BadXml::badDataTag_data() const
{
- QTest::addColumn<int>("dummy");
+ QTest::addColumn<bool>("shouldFail");
foreach (char const* str, badStrings()) {
- QTest::newRow(str) << 0;
+ QTest::newRow(qPrintable(QString("fail %1").arg(str))) << true;
+ QTest::newRow(qPrintable(QString("pass %1").arg(str))) << false;
}
}
--- /dev/null
+SOURCES += tst_benchlibcounting.cpp
+QT = core testlib
+
+mac:CONFIG -= app_bundle
+CONFIG -= debug_and_release_target
+
+TARGET = benchlibcounting
--- /dev/null
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore/QCoreApplication>
+#include <QtTest/QtTest>
+
+class tst_BenchlibCounting : public QObject
+{
+ Q_OBJECT
+
+private slots:
+ void passingBenchmark();
+ void skippingBenchmark();
+ void failingBenchmark();
+};
+
+void tst_BenchlibCounting::passingBenchmark()
+{
+ QBENCHMARK {
+ }
+}
+
+void tst_BenchlibCounting::skippingBenchmark()
+{
+ QBENCHMARK {
+ QSKIP("This is a skipping benchmark");
+ }
+}
+
+void tst_BenchlibCounting::failingBenchmark()
+{
+ QBENCHMARK {
+ QFAIL("This is a failing benchmark");
+ };
+}
+
+QTEST_MAIN(tst_BenchlibCounting)
+#include "tst_benchlibcounting.moc"
</TestFunction>
<TestFunction name="badDataTag">
<Message type="qdebug" file="" line="0">
- <DataTag><![CDATA[end cdata ]]]><![CDATA[]> text ]]]><![CDATA[]> more text]]></DataTag>
+ <DataTag><![CDATA[fail end cdata ]]]><![CDATA[]> text ]]]><![CDATA[]> more text]]></DataTag>
<Description><![CDATA[a message]]></Description>
</Message>
-<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="109">
- <DataTag><![CDATA[end cdata ]]]><![CDATA[]> text ]]]><![CDATA[]> more text]]></DataTag>
+<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="111">
+ <DataTag><![CDATA[fail 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" />
<Message type="qdebug" file="" line="0">
- <DataTag><![CDATA[quotes " text" more text]]></DataTag>
+ <DataTag><![CDATA[pass end cdata ]]]><![CDATA[]> text ]]]><![CDATA[]> more text]]></DataTag>
<Description><![CDATA[a message]]></Description>
</Message>
-<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="109">
- <DataTag><![CDATA[quotes " text" more text]]></DataTag>
+<Incident type="pass" file="" line="0">
+ <DataTag><![CDATA[pass end cdata ]]]><![CDATA[]> text ]]]><![CDATA[]> more text]]></DataTag>
+</Incident>
+<BenchmarkResult metric="Events" tag="pass end cdata ]]> text ]]> more text" value="0" iterations="1" />
+<Message type="qdebug" file="" line="0">
+ <DataTag><![CDATA[fail quotes " text" more text]]></DataTag>
+ <Description><![CDATA[a message]]></Description>
+</Message>
+<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="111">
+ <DataTag><![CDATA[fail quotes " text" more text]]></DataTag>
<Description><![CDATA[a failure]]></Description>
</Incident>
-<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>
+ <DataTag><![CDATA[pass quotes " text" more text]]></DataTag>
+ <Description><![CDATA[a message]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+ <DataTag><![CDATA[pass quotes " text" more text]]></DataTag>
+</Incident>
+<BenchmarkResult metric="Events" tag="pass quotes " text" more text" value="0" iterations="1" />
+<Message type="qdebug" file="" line="0">
+ <DataTag><![CDATA[fail xml close > open < tags < text]]></DataTag>
<Description><![CDATA[a message]]></Description>
</Message>
-<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="109">
- <DataTag><![CDATA[xml close > open < tags < text]]></DataTag>
+<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="111">
+ <DataTag><![CDATA[fail 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" />
<Message type="qdebug" file="" line="0">
- <DataTag><![CDATA[all > " mixed ]]]><![CDATA[]> up > " in < the ]]]><![CDATA[]> hopes < of triggering "< ]]]><![CDATA[]> bugs]]></DataTag>
+ <DataTag><![CDATA[pass xml close > open < tags < text]]></DataTag>
<Description><![CDATA[a message]]></Description>
</Message>
-<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="109">
- <DataTag><![CDATA[all > " mixed ]]]><![CDATA[]> up > " in < the ]]]><![CDATA[]> hopes < of triggering "< ]]]><![CDATA[]> bugs]]></DataTag>
+<Incident type="pass" file="" line="0">
+ <DataTag><![CDATA[pass xml close > open < tags < text]]></DataTag>
+</Incident>
+<BenchmarkResult metric="Events" tag="pass xml close > open < tags < text" value="0" iterations="1" />
+<Message type="qdebug" file="" line="0">
+ <DataTag><![CDATA[fail all > " mixed ]]]><![CDATA[]> up > " in < the ]]]><![CDATA[]> hopes < of triggering "< ]]]><![CDATA[]> bugs]]></DataTag>
+ <Description><![CDATA[a message]]></Description>
+</Message>
+<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="111">
+ <DataTag><![CDATA[fail 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" />
+<Message type="qdebug" file="" line="0">
+ <DataTag><![CDATA[pass all > " mixed ]]]><![CDATA[]> up > " in < the ]]]><![CDATA[]> hopes < of triggering "< ]]]><![CDATA[]> bugs]]></DataTag>
+ <Description><![CDATA[a message]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+ <DataTag><![CDATA[pass all > " mixed ]]]><![CDATA[]> up > " in < the ]]]><![CDATA[]> hopes < of triggering "< ]]]><![CDATA[]> bugs]]></DataTag>
+</Incident>
+<BenchmarkResult metric="Events" tag="pass all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs" value="0" iterations="1" />
</TestFunction>
<TestFunction name="badMessage">
<Message type="qdebug" file="" line="0">
********* Start testing of tst_BadXml *********
Config: Using QTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@
PASS : tst_BadXml::initTestCase()
-QDEBUG : tst_BadXml::badDataTag(end cdata ]]> text ]]> more text) a message
-FAIL! : tst_BadXml::badDataTag(end cdata ]]> text ]]> more text) a failure
- Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(109)]
-RESULT : tst_BadXml::badDataTag():"end cdata ]]> text ]]> more text":
+QDEBUG : tst_BadXml::badDataTag(fail end cdata ]]> text ]]> more text) a message
+FAIL! : tst_BadXml::badDataTag(fail end cdata ]]> text ]]> more text) a failure
+ Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(111)]
+QDEBUG : tst_BadXml::badDataTag(pass end cdata ]]> text ]]> more text) a message
+PASS : tst_BadXml::badDataTag(pass end cdata ]]> text ]]> more text)
+RESULT : tst_BadXml::badDataTag():"pass end cdata ]]> text ]]> more text":
0 events per iteration (total: 0, iterations: 1)
-QDEBUG : tst_BadXml::badDataTag(quotes " text" more text) a message
-FAIL! : tst_BadXml::badDataTag(quotes " text" more text) a failure
- Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(109)]
-RESULT : tst_BadXml::badDataTag():"quotes " text" more text":
+QDEBUG : tst_BadXml::badDataTag(fail quotes " text" more text) a message
+FAIL! : tst_BadXml::badDataTag(fail quotes " text" more text) a failure
+ Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(111)]
+QDEBUG : tst_BadXml::badDataTag(pass quotes " text" more text) a message
+PASS : tst_BadXml::badDataTag(pass quotes " text" more text)
+RESULT : tst_BadXml::badDataTag():"pass quotes " text" more text":
0 events per iteration (total: 0, iterations: 1)
-QDEBUG : tst_BadXml::badDataTag(xml close > open < tags < text) a message
-FAIL! : tst_BadXml::badDataTag(xml close > open < tags < text) a failure
- Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(109)]
-RESULT : tst_BadXml::badDataTag():"xml close > open < tags < text":
+QDEBUG : tst_BadXml::badDataTag(fail xml close > open < tags < text) a message
+FAIL! : tst_BadXml::badDataTag(fail xml close > open < tags < text) a failure
+ Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(111)]
+QDEBUG : tst_BadXml::badDataTag(pass xml close > open < tags < text) a message
+PASS : tst_BadXml::badDataTag(pass xml close > open < tags < text)
+RESULT : tst_BadXml::badDataTag():"pass xml close > open < tags < text":
0 events per iteration (total: 0, iterations: 1)
-QDEBUG : tst_BadXml::badDataTag(all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs) a message
-FAIL! : tst_BadXml::badDataTag(all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs) a failure
- Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(109)]
-RESULT : tst_BadXml::badDataTag():"all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs":
+QDEBUG : tst_BadXml::badDataTag(fail all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs) a message
+FAIL! : tst_BadXml::badDataTag(fail all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs) a failure
+ Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(111)]
+QDEBUG : tst_BadXml::badDataTag(pass all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs) a message
+PASS : tst_BadXml::badDataTag(pass all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs)
+RESULT : tst_BadXml::badDataTag():"pass all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs":
0 events per iteration (total: 0, iterations: 1)
QDEBUG : tst_BadXml::badMessage(string 0) end cdata ]]> text ]]> more text
PASS : tst_BadXml::badMessage(string 0)
PASS : tst_BadXml::badMessage(string 3)
FAIL! : tst_BadXml::failWithNoFile() failure message
PASS : tst_BadXml::cleanupTestCase()
-Totals: 6 passed, 5 failed, 0 skipped
+Totals: 10 passed, 5 failed, 0 skipped
********* Finished testing of tst_BadXml *********
</TestFunction>
<TestFunction name="badDataTag">
<Message type="qdebug" file="" line="0">
- <DataTag><![CDATA[end cdata ]]]><![CDATA[]> text ]]]><![CDATA[]> more text]]></DataTag>
+ <DataTag><![CDATA[fail end cdata ]]]><![CDATA[]> text ]]]><![CDATA[]> more text]]></DataTag>
<Description><![CDATA[a message]]></Description>
</Message>
-<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="109">
- <DataTag><![CDATA[end cdata ]]]><![CDATA[]> text ]]]><![CDATA[]> more text]]></DataTag>
+<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="111">
+ <DataTag><![CDATA[fail 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" />
<Message type="qdebug" file="" line="0">
- <DataTag><![CDATA[quotes " text" more text]]></DataTag>
+ <DataTag><![CDATA[pass end cdata ]]]><![CDATA[]> text ]]]><![CDATA[]> more text]]></DataTag>
<Description><![CDATA[a message]]></Description>
</Message>
-<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="109">
- <DataTag><![CDATA[quotes " text" more text]]></DataTag>
+<Incident type="pass" file="" line="0">
+ <DataTag><![CDATA[pass end cdata ]]]><![CDATA[]> text ]]]><![CDATA[]> more text]]></DataTag>
+</Incident>
+<BenchmarkResult metric="Events" tag="pass end cdata ]]> text ]]> more text" value="0" iterations="1" />
+<Message type="qdebug" file="" line="0">
+ <DataTag><![CDATA[fail quotes " text" more text]]></DataTag>
+ <Description><![CDATA[a message]]></Description>
+</Message>
+<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="111">
+ <DataTag><![CDATA[fail quotes " text" more text]]></DataTag>
<Description><![CDATA[a failure]]></Description>
</Incident>
-<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>
+ <DataTag><![CDATA[pass quotes " text" more text]]></DataTag>
+ <Description><![CDATA[a message]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+ <DataTag><![CDATA[pass quotes " text" more text]]></DataTag>
+</Incident>
+<BenchmarkResult metric="Events" tag="pass quotes " text" more text" value="0" iterations="1" />
+<Message type="qdebug" file="" line="0">
+ <DataTag><![CDATA[fail xml close > open < tags < text]]></DataTag>
<Description><![CDATA[a message]]></Description>
</Message>
-<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="109">
- <DataTag><![CDATA[xml close > open < tags < text]]></DataTag>
+<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="111">
+ <DataTag><![CDATA[fail 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" />
<Message type="qdebug" file="" line="0">
- <DataTag><![CDATA[all > " mixed ]]]><![CDATA[]> up > " in < the ]]]><![CDATA[]> hopes < of triggering "< ]]]><![CDATA[]> bugs]]></DataTag>
+ <DataTag><![CDATA[pass xml close > open < tags < text]]></DataTag>
<Description><![CDATA[a message]]></Description>
</Message>
-<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="109">
- <DataTag><![CDATA[all > " mixed ]]]><![CDATA[]> up > " in < the ]]]><![CDATA[]> hopes < of triggering "< ]]]><![CDATA[]> bugs]]></DataTag>
+<Incident type="pass" file="" line="0">
+ <DataTag><![CDATA[pass xml close > open < tags < text]]></DataTag>
+</Incident>
+<BenchmarkResult metric="Events" tag="pass xml close > open < tags < text" value="0" iterations="1" />
+<Message type="qdebug" file="" line="0">
+ <DataTag><![CDATA[fail all > " mixed ]]]><![CDATA[]> up > " in < the ]]]><![CDATA[]> hopes < of triggering "< ]]]><![CDATA[]> bugs]]></DataTag>
+ <Description><![CDATA[a message]]></Description>
+</Message>
+<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="111">
+ <DataTag><![CDATA[fail 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" />
+<Message type="qdebug" file="" line="0">
+ <DataTag><![CDATA[pass all > " mixed ]]]><![CDATA[]> up > " in < the ]]]><![CDATA[]> hopes < of triggering "< ]]]><![CDATA[]> bugs]]></DataTag>
+ <Description><![CDATA[a message]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+ <DataTag><![CDATA[pass all > " mixed ]]]><![CDATA[]> up > " in < the ]]]><![CDATA[]> hopes < of triggering "< ]]]><![CDATA[]> bugs]]></DataTag>
+</Incident>
+<BenchmarkResult metric="Events" tag="pass all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs" value="0" iterations="1" />
</TestFunction>
<TestFunction name="badMessage">
<Message type="qdebug" file="" line="0">
<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="8" failures="5" tests="5" name="tst_BadXml">
+<testsuite errors="12" failures="5" tests="5" name="tst_BadXml">
<properties>
<property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
<property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
</properties>
<testcase result="pass" name="initTestCase"/>
<testcase result="fail" name="badDataTag">
- <!-- tag="end cdata ]]> text ]]> more text" message="a message" type="qdebug" -->
- <failure tag="end cdata ]]> text ]]> more text" message="a failure" result="fail"/>
- <!-- tag="quotes " text" more text" message="a message" type="qdebug" -->
- <failure tag="quotes " text" more text" message="a failure" result="fail"/>
- <!-- tag="xml close > open < tags < text" message="a message" type="qdebug" -->
- <failure tag="xml close > open < tags < text" message="a failure" result="fail"/>
- <!-- tag="all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs" message="a message" type="qdebug" -->
- <failure tag="all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs" message="a failure" result="fail"/>
+ <!-- tag="fail end cdata ]]> text ]]> more text" message="a message" type="qdebug" -->
+ <failure tag="fail end cdata ]]> text ]]> more text" message="a failure" result="fail"/>
+ <!-- tag="pass end cdata ]]> text ]]> more text" message="a message" type="qdebug" -->
+ <!-- tag="fail quotes " text" more text" message="a message" type="qdebug" -->
+ <failure tag="fail quotes " text" more text" message="a failure" result="fail"/>
+ <!-- tag="pass quotes " text" more text" message="a message" type="qdebug" -->
+ <!-- tag="fail xml close > open < tags < text" message="a message" type="qdebug" -->
+ <failure tag="fail xml close > open < tags < text" message="a failure" result="fail"/>
+ <!-- tag="pass xml close > open < tags < text" message="a message" type="qdebug" -->
+ <!-- tag="fail all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs" message="a message" type="qdebug" -->
+ <failure tag="fail all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs" message="a failure" result="fail"/>
+ <!-- tag="pass all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs" message="a message" type="qdebug" -->
</testcase>
<testcase result="pass" name="badMessage">
<!-- tag="string 0" message="end cdata ]]> text ]]> more text" type="qdebug" -->
<![CDATA[a message]]>
<![CDATA[a message]]>
<![CDATA[a message]]>
+<![CDATA[a message]]>
+<![CDATA[a message]]>
+<![CDATA[a message]]>
+<![CDATA[a message]]>
<![CDATA[end cdata ]]]><![CDATA[]> text ]]]><![CDATA[]> more text]]>
<![CDATA[quotes " text" more text]]>
<![CDATA[xml close > open < tags < text]]>
Config: Using QTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@
PASS : tst_BenchlibCallgrind::initTestCase()
PASS : tst_BenchlibCallgrind::twoHundredMillionInstructions()
-PASS : tst_BenchlibCallgrind::twoHundredMillionInstructions()
RESULT : tst_BenchlibCallgrind::twoHundredMillionInstructions():
200,000,158 instruction reads per iteration (total: 200,000,158, iterations: 1)
PASS : tst_BenchlibCallgrind::cleanupTestCase()
-Totals: 4 passed, 0 failed, 0 skipped
+Totals: 3 passed, 0 failed, 0 skipped
********* Finished testing of tst_BenchlibCallgrind *********
--- /dev/null
+<Environment>
+ <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+ <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
+</Environment>
+<TestFunction name="initTestCase">
+<Incident type="pass" file="" line="0" />
+</TestFunction>
+<TestFunction name="passingBenchmark">
+<Incident type="pass" file="" line="0" />
+<BenchmarkResult metric="Events" tag="" value="0" iterations="1" />
+</TestFunction>
+<TestFunction name="skippingBenchmark">
+<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp" line="64">
+ <Description><![CDATA[This is a skipping benchmark]]></Description>
+</Message>
+</TestFunction>
+<TestFunction name="failingBenchmark">
+<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp" line="71">
+ <Description><![CDATA[This is a failing benchmark]]></Description>
+</Incident>
+</TestFunction>
+<TestFunction name="cleanupTestCase">
+<Incident type="pass" file="" line="0" />
+</TestFunction>
--- /dev/null
+********* Start testing of tst_BenchlibCounting *********
+Config: Using QTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@
+PASS : tst_BenchlibCounting::initTestCase()
+PASS : tst_BenchlibCounting::passingBenchmark()
+RESULT : tst_BenchlibCounting::passingBenchmark():
+ 0 events per iteration (total: 0, iterations: 1)
+SKIP : tst_BenchlibCounting::skippingBenchmark() This is a skipping benchmark
+ Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp(64)]
+FAIL! : tst_BenchlibCounting::failingBenchmark() This is a failing benchmark
+ Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp(71)]
+PASS : tst_BenchlibCounting::cleanupTestCase()
+Totals: 3 passed, 1 failed, 1 skipped
+********* Finished testing of tst_BenchlibCounting *********
--- /dev/null
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<TestCase name="tst_BenchlibCounting">
+<Environment>
+ <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+ <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
+</Environment>
+<TestFunction name="initTestCase">
+<Incident type="pass" file="" line="0" />
+</TestFunction>
+<TestFunction name="passingBenchmark">
+<Incident type="pass" file="" line="0" />
+<BenchmarkResult metric="Events" tag="" value="0" iterations="1" />
+</TestFunction>
+<TestFunction name="skippingBenchmark">
+<Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp" line="64">
+ <Description><![CDATA[This is a skipping benchmark]]></Description>
+</Message>
+</TestFunction>
+<TestFunction name="failingBenchmark">
+<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp" line="71">
+ <Description><![CDATA[This is a failing benchmark]]></Description>
+</Incident>
+</TestFunction>
+<TestFunction name="cleanupTestCase">
+<Incident type="pass" file="" line="0" />
+</TestFunction>
+</TestCase>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8" ?>
+<testsuite errors="1" failures="1" tests="5" name="tst_BenchlibCounting">
+ <properties>
+ <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+ <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
+ </properties>
+ <testcase result="pass" name="initTestCase"/>
+ <testcase result="pass" name="passingBenchmark">
+ </testcase>
+ <testcase name="skippingBenchmark">
+ <!-- message="This is a skipping benchmark" type="skip" -->
+ </testcase>
+ <testcase result="fail" name="failingBenchmark">
+ <failure message="This is a failing benchmark" result="fail"/>
+ </testcase>
+ <testcase result="pass" name="cleanupTestCase"/>
+ <system-err>
+<![CDATA[This is a skipping benchmark]]>
+ </system-err>
+</testsuite>
Config: Using QTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@
PASS : tst_BenchlibOneHundredMinimum::initTestCase()
PASS : tst_BenchlibOneHundredMinimum::threeEvents()
-PASS : tst_BenchlibOneHundredMinimum::threeEvents()
-PASS : tst_BenchlibOneHundredMinimum::threeEvents()
-PASS : tst_BenchlibOneHundredMinimum::threeEvents()
-PASS : tst_BenchlibOneHundredMinimum::threeEvents()
-PASS : tst_BenchlibOneHundredMinimum::threeEvents()
-PASS : tst_BenchlibOneHundredMinimum::threeEvents()
RESULT : tst_BenchlibOneHundredMinimum::threeEvents():
3.00 events per iteration (total: 192, iterations: 64)
PASS : tst_BenchlibOneHundredMinimum::cleanupTestCase()
-Totals: 9 passed, 0 failed, 0 skipped
+Totals: 3 passed, 0 failed, 0 skipped
********* Finished testing of tst_BenchlibOneHundredMinimum *********
assert \
badxml \
benchlibcallgrind \
+ benchlibcounting \
benchlibeventcounter \
benchliboptions \
benchlibtickcounter \
<file>expected_badxml.xml</file>
<file>expected_badxml.xunitxml</file>
<file>expected_benchlibcallgrind.txt</file>
+ <file>expected_benchlibcounting.lightxml</file>
+ <file>expected_benchlibcounting.txt</file>
+ <file>expected_benchlibcounting.xml</file>
+ <file>expected_benchlibcounting.xunitxml</file>
<file>expected_benchlibeventcounter.lightxml</file>
<file>expected_benchlibeventcounter.txt</file>
<file>expected_benchlibeventcounter.xml</file>
// Only run on platforms where callgrind is available.
<< "benchlibcallgrind"
#endif
+ << "benchlibcounting"
<< "benchlibeventcounter"
<< "benchliboptions"
<< "cmptest"
else if (subtest == "badxml") {
arguments << "-eventcounter";
}
+ else if (subtest == "benchlibcounting") {
+ arguments << "-eventcounter";
+ }
else if (subtest == "printdatatags") {
arguments << "-datatags";
}
projects / profile / ivi / qtbase.git / commitdiff