summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2018-12-20 13:43:22 +0100
committerUlf Hermann <ulf.hermann@qt.io>2018-12-20 13:46:17 +0000
commitdd161df8beff372842e17ed2739e4b52fc4a6ee7 (patch)
tree9c9434496b713354137801d4feed08734fb28c79
parent679f3c0fda887d0b4b50ab178b04ed5a0f9efc44 (diff)
Fix perfdata test
In stats mode we only get one buffer flush now, and the error messages for missing ELF files changed slightly. Change-Id: I48d4cb909a61dffe9da9aaa44c668a314275f11c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--tests/auto/perfdata/tst_perfdata.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/perfdata/tst_perfdata.cpp b/tests/auto/perfdata/tst_perfdata.cpp
index 45bb5ea..150fb65 100644
--- a/tests/auto/perfdata/tst_perfdata.cpp
+++ b/tests/auto/perfdata/tst_perfdata.cpp
@@ -91,8 +91,8 @@ void TestPerfData::testTracingData_data()
QTest::addColumn<uint>("flushes");
QTest::addColumn<quint64>("maxTime");
QTest::addColumn<bool>("stats");
- QTest::newRow("stream stats") << ":/probe.data.stream" << 2u << 13780586522722ull << true;
- QTest::newRow("file stats") << ":/probe.data.file" << 3u << 13732862219876ull << true;
+ QTest::newRow("stream stats") << ":/probe.data.stream" << 1u << 13780586522722ull << true;
+ QTest::newRow("file stats") << ":/probe.data.file" << 1u << 13732862219876ull << true;
QTest::newRow("stream data") << ":/probe.data.stream" << 2u << 13780586522722ull << false;
QTest::newRow("file data") << ":/probe.data.file" << 3u << 13732862219876ull << false;
}
@@ -114,27 +114,27 @@ void TestPerfData::testTracingData()
PerfUnwind unwind(&output, ":/", QString(), QString(), QString(), stats);
if (!stats) {
QTest::ignoreMessage(QtWarningMsg,
- "PerfUnwind::ErrorCode(MissingElfFile): Could not find ELF file for "
+ "PerfUnwind::MissingElfFile: Could not find ELF file for "
"/home/ulf/dev/untitled1-Qt_5_9_1_gcc_64-Profile/untitled1. "
"This can break stack unwinding and lead to missing symbols.");
QTest::ignoreMessage(QtWarningMsg,
- "PerfUnwind::ErrorCode(MissingElfFile): Could not find ELF file for "
+ "PerfUnwind::MissingElfFile: Could not find ELF file for "
"/lib/x86_64-linux-gnu/ld-2.24.so. "
"This can break stack unwinding and lead to missing symbols.");
QTest::ignoreMessage(QtWarningMsg,
- "PerfUnwind::ErrorCode(MissingElfFile): Could not find ELF file for "
+ "PerfUnwind::MissingElfFile: Could not find ELF file for "
"/usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.22. "
"This can break stack unwinding and lead to missing symbols.");
QTest::ignoreMessage(QtWarningMsg,
- "PerfUnwind::ErrorCode(MissingElfFile): Could not find ELF file for "
+ "PerfUnwind::MissingElfFile: Could not find ELF file for "
"/lib/x86_64-linux-gnu/libm-2.24.so. "
"This can break stack unwinding and lead to missing symbols.");
QTest::ignoreMessage(QtWarningMsg,
- "PerfUnwind::ErrorCode(MissingElfFile): Could not find ELF file for "
+ "PerfUnwind::MissingElfFile: Could not find ELF file for "
"/lib/x86_64-linux-gnu/libgcc_s.so.1. "
"This can break stack unwinding and lead to missing symbols.");
QTest::ignoreMessage(QtWarningMsg,
- "PerfUnwind::ErrorCode(MissingElfFile): Could not find ELF file for "
+ "PerfUnwind::MissingElfFile: Could not find ELF file for "
"/lib/x86_64-linux-gnu/libc-2.24.so. "
"This can break stack unwinding and lead to missing symbols.");
}