From 8e0034b4091e0ad08e16aba194c53d6582710550 Mon Sep 17 00:00:00 2001 From: aavit Date: Tue, 2 Nov 2010 14:02:43 +0100 Subject: Put more platform info in the report headers --- tests/arthur/baselineserver/src/baselineserver.cpp | 2 +- tests/arthur/baselineserver/src/htmlpage.cpp | 11 +++++------ tests/arthur/baselineserver/src/htmlpage.h | 3 ++- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/arthur/baselineserver/src/baselineserver.cpp b/tests/arthur/baselineserver/src/baselineserver.cpp index 1e241c1..2c0a91e 100644 --- a/tests/arthur/baselineserver/src/baselineserver.cpp +++ b/tests/arthur/baselineserver/src/baselineserver.cpp @@ -182,7 +182,7 @@ void BaselineHandler::provideBaselineChecksums(const QByteArray &itemListBlock) QDataStream ods(&block, QIODevice::WriteOnly); ods << itemList; proto.sendBlock(BaselineProtocol::Ack, block); - report.start(BaselineServer::storagePath(), runId, plat, itemList); + report.start(BaselineServer::storagePath(), runId, plat, proto.socket.peerAddress().toString(), itemList); } diff --git a/tests/arthur/baselineserver/src/htmlpage.cpp b/tests/arthur/baselineserver/src/htmlpage.cpp index 14bcb0c..5eb5a2c 100644 --- a/tests/arthur/baselineserver/src/htmlpage.cpp +++ b/tests/arthur/baselineserver/src/htmlpage.cpp @@ -20,12 +20,13 @@ QString HTMLPage::filePath() return path; } -void HTMLPage::start(const QString &storagepath, const QString &runId, const PlatformInfo pinfo, const ImageItemList &itemList) +void HTMLPage::start(const QString &storagepath, const QString &runId, const PlatformInfo pinfo, const QString &hostAddress, const ImageItemList &itemList) { end(); id = runId; plat = pinfo; + address = hostAddress; root = storagepath; imageItems = itemList; QString dir = root + QLS("reports/"); @@ -48,11 +49,9 @@ void HTMLPage::writeHeader(const ImageItem &item) out.setDevice(&file); out << "

Lancelot results from run " << id << "

\n\n"; - out << "

Host: " << plat.hostName << "

\n"; - out << "

Qt version: " << plat.qtVersion << "

\n"; - out << "

Build key: " << plat.buildKey << "

\n"; - out << "

Engine: " << item.engineAsString() << "

\n"; - out << "

Format: " << item.formatAsString() << "

\n\n"; + out << "

Host: " << plat.hostName << " [" << address << "] OS: " << plat.osName << " [enum: " << plat.osVersion << "]

\n"; + out << "

Qt version: " << plat.qtVersion << " [commit: " << plat.gitCommit << "] Build key: \"" << plat.buildKey << "\"

\n"; + out << "

Engine: " << item.engineAsString() << " Format: " << item.formatAsString() << "

\n\n"; out << "