summaryrefslogtreecommitdiffstats
path: root/tests/auto/selftests
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/selftests')
-rw-r--r--tests/auto/selftests/expected_badxml.lightxml8
-rw-r--r--tests/auto/selftests/expected_badxml.xml8
-rw-r--r--tests/auto/selftests/expected_benchlibcallgrind.lightxml2
-rw-r--r--tests/auto/selftests/expected_benchlibcallgrind.txt2
-rw-r--r--tests/auto/selftests/expected_benchlibcallgrind.xml2
-rw-r--r--tests/auto/selftests/expected_benchlibeventcounter.lightxml14
-rw-r--r--tests/auto/selftests/expected_benchlibeventcounter.xml14
-rw-r--r--tests/auto/selftests/expected_cmptest.txt2
-rw-r--r--tests/auto/selftests/expected_crashes_3.txt2
-rw-r--r--tests/auto/selftests/expected_longstring.txt2
-rw-r--r--tests/auto/selftests/expected_maxwarnings.txt2
-rw-r--r--tests/auto/selftests/expected_skip.txt2
-rw-r--r--tests/auto/selftests/tst_selftests.cpp13
-rwxr-xr-xtests/auto/selftests/xunit/tst_xunitbin11624 -> 0 bytes
14 files changed, 38 insertions, 35 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 ]]&gt; text ]]&gt; more text" value="0" iterations="1" />
+<BenchmarkResult metric="Events" tag="end cdata ]]&gt; text ]]&gt; 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 &quot; text&quot; more text" value="0" iterations="1" />
+<BenchmarkResult metric="Events" tag="quotes &quot; text&quot; 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 &gt; open &lt; tags &lt; text" value="0" iterations="1" />
+<BenchmarkResult metric="Events" tag="xml close &gt; open &lt; tags &lt; 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 &gt; &quot; mixed ]]&gt; up &gt; &quot; in &lt; the ]]&gt; hopes &lt; of triggering &quot;&lt; ]]&gt; bugs" value="0" iterations="1" />
+<BenchmarkResult metric="Events" tag="all &gt; &quot; mixed ]]&gt; up &gt; &quot; in &lt; the ]]&gt; hopes &lt; of triggering &quot;&lt; ]]&gt; 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 ]]&gt; text ]]&gt; more text" value="0" iterations="1" />
+<BenchmarkResult metric="Events" tag="end cdata ]]&gt; text ]]&gt; 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 &quot; text&quot; more text" value="0" iterations="1" />
+<BenchmarkResult metric="Events" tag="quotes &quot; text&quot; 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 &gt; open &lt; tags &lt; text" value="0" iterations="1" />
+<BenchmarkResult metric="Events" tag="xml close &gt; open &lt; tags &lt; 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 &gt; &quot; mixed ]]&gt; up &gt; &quot; in &lt; the ]]&gt; hopes &lt; of triggering &quot;&lt; ]]&gt; bugs" value="0" iterations="1" />
+<BenchmarkResult metric="Events" tag="all &gt; &quot; mixed ]]&gt; up &gt; &quot; in &lt; the ]]&gt; hopes &lt; of triggering &quot;&lt; ]]&gt; 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.txt b/tests/auto/selftests/expected_benchlibcallgrind.txt
index caf2424..f172711 100644
--- a/tests/auto/selftests/expected_benchlibcallgrind.txt
+++ b/tests/auto/selftests/expected_benchlibcallgrind.txt
@@ -2,7 +2,7 @@
Config: Using QTest library 4.5.0, Qt 4.5.0
PASS : tst_BenchlibCallgrind::initTestCase()
RESULT : tst_BenchlibCallgrind::twoHundredMillionInstructions():
- 200,000,000 instr. loads per iteration (total: 200000000, iterations: 1)
+ 200,000,000 instruction reads per iteration (total: 200000000, iterations: 1)
PASS : tst_BenchlibCallgrind::twoHundredMillionInstructions()
PASS : tst_BenchlibCallgrind::cleanupTestCase()
Totals: 3 passed, 0 failed, 0 skipped
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">
diff --git a/tests/auto/selftests/expected_cmptest.txt b/tests/auto/selftests/expected_cmptest.txt
index 2ee3005..fd5b486 100644
--- a/tests/auto/selftests/expected_cmptest.txt
+++ b/tests/auto/selftests/expected_cmptest.txt
@@ -1,5 +1,5 @@
********* Start testing of tst_Cmptest *********
-Config: Using QTest library 4.6.4, Qt 4.6.4
+Config: Using QTest library 4.7.0, Qt 4.7.0
PASS : tst_Cmptest::initTestCase()
PASS : tst_Cmptest::compare_boolfuncs()
PASS : tst_Cmptest::compare_pointerfuncs()
diff --git a/tests/auto/selftests/expected_crashes_3.txt b/tests/auto/selftests/expected_crashes_3.txt
index 60914f8..3aced25 100644
--- a/tests/auto/selftests/expected_crashes_3.txt
+++ b/tests/auto/selftests/expected_crashes_3.txt
@@ -1,5 +1,5 @@
********* Start testing of tst_Crashes *********
-Config: Using QTest library 4.6.4, Qt 4.6.4
+Config: Using QTest library 4.7.0, Qt 4.7.0
PASS : tst_Crashes::initTestCase()
QFATAL : tst_Crashes::crash() Received signal 11
FAIL! : tst_Crashes::crash() Received a fatal error.
diff --git a/tests/auto/selftests/expected_longstring.txt b/tests/auto/selftests/expected_longstring.txt
index 566e43f..1461bc6 100644
--- a/tests/auto/selftests/expected_longstring.txt
+++ b/tests/auto/selftests/expected_longstring.txt
@@ -1,5 +1,5 @@
********* Start testing of tst_LongString *********
-Config: Using QTest library 4.6.4, Qt 4.6.4
+Config: Using QTest library 4.7.0, Qt 4.7.0
PASS : tst_LongString::initTestCase()
FAIL! : tst_LongString::failWithLongString() Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui.
diff --git a/tests/auto/selftests/expected_maxwarnings.txt b/tests/auto/selftests/expected_maxwarnings.txt
index 5fb7f58..908bd5d 100644
--- a/tests/auto/selftests/expected_maxwarnings.txt
+++ b/tests/auto/selftests/expected_maxwarnings.txt
@@ -1,5 +1,5 @@
********* Start testing of MaxWarnings *********
-Config: Using QTest library 4.6.4, Qt 4.6.4
+Config: Using QTest library 4.7.0, Qt 4.7.0
PASS : MaxWarnings::initTestCase()
QWARN : MaxWarnings::warn() 0
QWARN : MaxWarnings::warn() 1
diff --git a/tests/auto/selftests/expected_skip.txt b/tests/auto/selftests/expected_skip.txt
index 650d816..e5bf1ff 100644
--- a/tests/auto/selftests/expected_skip.txt
+++ b/tests/auto/selftests/expected_skip.txt
@@ -1,5 +1,5 @@
********* Start testing of tst_Skip *********
-Config: Using QTest library 4.6.4, Qt 4.6.4
+Config: Using QTest library 4.7.0, Qt 4.7.0
PASS : tst_Skip::initTestCase()
SKIP : tst_Skip::test() skipping all
Loc: [/home/user/depot/qt-git/mainline/tests/auto/selftests/skip/tst_skip.cpp(68)]
diff --git a/tests/auto/selftests/tst_selftests.cpp b/tests/auto/selftests/tst_selftests.cpp
index 30b2126..0818b4c 100644
--- a/tests/auto/selftests/tst_selftests.cpp
+++ b/tests/auto/selftests/tst_selftests.cpp
@@ -91,7 +91,7 @@ inline bool qCompare
if (r1.unit == "msec") {
variance = 0.1;
}
- else if (r1.unit == "instr. loads") {
+ else if (r1.unit == "instruction reads") {
variance = 0.001;
}
else if (r1.unit == "ticks") {
@@ -539,7 +539,7 @@ BenchmarkResult BenchmarkResult::parse(QString const& line, QString* error)
/* This code avoids using a QRegExp because QRegExp might be broken. */
- /* Sample format: 4,000 msec per iteration (total: 4000, iterations: 1) */
+ /* Sample format: 4,000 msec per iteration (total: 4,000, iterations: 1) */
QString sFirstNumber;
while (!remaining.isEmpty() && !remaining.at(0).isSpace()) {
@@ -573,7 +573,7 @@ BenchmarkResult BenchmarkResult::parse(QString const& line, QString* error)
remaining = remaining.mid(sizeof(periterbit)-1);
- /* Remaining: 4000, iterations: 1) */
+ /* Remaining: 4,000, iterations: 1) */
static const char itersbit[] = ", iterations: ";
QString sTotal;
while (!remaining.startsWith(itersbit) && !remaining.isEmpty()) {
@@ -587,9 +587,12 @@ BenchmarkResult BenchmarkResult::parse(QString const& line, QString* error)
remaining = remaining.mid(sizeof(itersbit)-1);
- qint64 total = sTotal.toLongLong(&ok);
+ /* 4,000 -> 4000 */
+ sTotal.remove(',');
+
+ double total = sTotal.toDouble(&ok);
if (!ok) {
- if (error) *error = sTotal + " (total) is not a valid integer";
+ if (error) *error = sTotal + " (total) is not a valid number";
return out;
}
diff --git a/tests/auto/selftests/xunit/tst_xunit b/tests/auto/selftests/xunit/tst_xunit
deleted file mode 100755
index 31d03a8..0000000
--- a/tests/auto/selftests/xunit/tst_xunit
+++ /dev/null
Binary files differ
generated by cgit v0.12 at 2024-12-29 04:56:33 (GMT)