diff options
| author | aavit <qt-info@nokia.com> | 2010-11-02 13:02:43 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2010-11-02 13:02:43 (GMT) |
| commit | 8e0034b4091e0ad08e16aba194c53d6582710550 (patch) | |
| tree | 494b3fd46270fad71c014000b3a3d5f780774758 | |
| parent | 1c04ebfcaf3f42585e9fceaaca5e798f13fa54c9 (diff) | |
| download | Qt-8e0034b4091e0ad08e16aba194c53d6582710550.zip Qt-8e0034b4091e0ad08e16aba194c53d6582710550.tar.gz Qt-8e0034b4091e0ad08e16aba194c53d6582710550.tar.bz2 | |
Put more platform info in the report headers
| -rw-r--r-- | tests/arthur/baselineserver/src/baselineserver.cpp | 2 | ||||
| -rw-r--r-- | tests/arthur/baselineserver/src/htmlpage.cpp | 11 | ||||
| -rw-r--r-- | 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 << "<html><body><h1>Lancelot results from run " << id << "</h1>\n\n"; - out << "<h3>Host: " << plat.hostName << "</h3>\n"; - out << "<h3>Qt version: " << plat.qtVersion << "</h3>\n"; - out << "<h3>Build key: " << plat.buildKey << "</h3>\n"; - out << "<h3>Engine: " << item.engineAsString() << "</h3>\n"; - out << "<h3>Format: " << item.formatAsString() << "</h3>\n\n"; + out << "<h3>Host: " << plat.hostName << " [" << address << "] OS: " << plat.osName << " [enum: " << plat.osVersion << "]</h3>\n"; + out << "<h3>Qt version: " << plat.qtVersion << " [commit: " << plat.gitCommit << "] Build key: \"" << plat.buildKey << "\"</h3>\n"; + out << "<h3>Engine: " << item.engineAsString() << " Format: " << item.formatAsString() << "</h3>\n\n"; out << "<h3><a href=\"/cgi-bin/server.cgi?cmd=updateAllBaselines&id="<< id << "&host=" << plat.hostName << "&engine=" << item.engineAsString() << "&format=" << item.formatAsString() << "&url=" << pageUrl diff --git a/tests/arthur/baselineserver/src/htmlpage.h b/tests/arthur/baselineserver/src/htmlpage.h index a937052..5f819f3 100644 --- a/tests/arthur/baselineserver/src/htmlpage.h +++ b/tests/arthur/baselineserver/src/htmlpage.h @@ -11,7 +11,7 @@ public: HTMLPage(); ~HTMLPage(); - void start(const QString &storagePath, const QString &runId, const PlatformInfo pinfo, const ImageItemList &itemList); + void start(const QString &storagePath, const QString &runId, const PlatformInfo pinfo, const QString &hostAddress, const ImageItemList &itemList); void addItem(const QString &baseline, const QString &rendered, const ImageItem &item); void end(); QString filePath(); @@ -29,6 +29,7 @@ private: QTextStream out; QString id; PlatformInfo plat; + QString address; ImageItemList imageItems; bool headerWritten; }; |