diff options
| -rw-r--r-- | src/testlib/qplaintestlogger.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/testlib/qplaintestlogger.cpp b/src/testlib/qplaintestlogger.cpp index 250015f7d62..5cb3f7dadc5 100644 --- a/src/testlib/qplaintestlogger.cpp +++ b/src/testlib/qplaintestlogger.cpp @@ -301,8 +301,15 @@ void QPlainTestLogger::printBenchmarkResultsHeader(const QBenchmarkResult &resul buf.appendf("%s: %s::%s", QTest::benchmarkResult2String(), QTestResult::currentTestObjectName(), result.context.slotName.toLatin1().data()); - if (QByteArray tag = result.context.tag.toLocal8Bit(); !tag.isEmpty()) - buf.appendf(":\"%s\":\n", tag.data()); + QByteArray tag = QTestResult::currentDataTag(); + QByteArray gtag = QTestResult::currentGlobalDataTag(); + + if (!gtag.isEmpty() && !tag.isEmpty()) + buf.appendf(":\"%s:%s\":\n", gtag.constData(), tag.constData()); + else if (!gtag.isEmpty()) + buf.appendf(":\"%s\":\n", gtag.constData()); + else if (!tag.isEmpty()) + buf.appendf(":\"%s\":\n", tag.constData()); else buf.append(":\n"); outputMessage(buf); |