diff --git a/framework/core.py b/framework/core.py index 03f8b8aeb3d1ad01473d4f2c1add8b8faee481a4..8d6482e0e87085cb1fbe46eaecc8a8770859ea3a 100644 --- a/framework/core.py +++ b/framework/core.py @@ -269,11 +269,10 @@ class Environment: command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) (stdout,stderr) = p.communicate(); return stderr+stdout - print >>self.file, "glxinfo:", encode(stderr+stdout) def collectData(self): - print >>self.file, "glxinfo:", encode(self.run('glxinfo')) - print >>self.file, "lspci:", encode(self.run('lspci')) + print >>self.file, "glxinfo:", '@@@' + encode(self.run('glxinfo')) + print >>self.file, "lspci:", '@@@' + encode(self.run('lspci')) class Test: diff --git a/piglit-summary-html.py b/piglit-summary-html.py index 387fa85dc1a75defd7ad8800bcf6266a2cfde66b..5956378ca40df5d7849de9ad29e3bdf45bb4a5df 100755 --- a/piglit-summary-html.py +++ b/piglit-summary-html.py @@ -36,7 +36,7 @@ import framework.summary ############################################################################# def testPathToHtmlFilename(path): - return filter(lambda s: s.isalnum() or s == '_', path.replace('/', '__')) + '.html' + return 'test_' + filter(lambda s: s.isalnum() or s == '_', path.replace('/', '__')) + '.html' ############################################################################# @@ -71,6 +71,8 @@ IndexGroupGroup = readfile(templatedir + 'index_groupgroup.html') IndexTest = readfile(templatedir + 'index_test.html') IndexTestTestrun = readfile(templatedir + 'index_test_testrun.html') +Testrun = readfile(templatedir + 'testrun.html') + SummaryPages = { 'all': 'index.html', 'changes': 'changes.html', @@ -129,6 +131,13 @@ def writeResultHtml(test, testResult, filename): writefile(filename, Result % locals()) +def writeTestrunHtml(testrun, filename): + detaildict = dict(filter(lambda item: item[0] in testrun.globalkeys, testrun.__dict__.items())) + details = buildDetails(detaildict) + name = testrun.name + codename = testrun.codename + + writefile(filename, Testrun % locals()) def buildTestSummary(indent, alternate, testsummary): tenindent = 10 - indent @@ -298,6 +307,7 @@ def main(): tr.codename = filter(lambda s: s.isalnum(), tr.name) dirname = summaryDir + '/' + tr.codename core.checkDir(dirname, False) + writeTestrunHtml(tr, dirname + '/index.html') for test in summary.allTests(): filename = dirname + '/' + testPathToHtmlFilename(test.path) writeResultHtml(test, test.results[j], filename) diff --git a/templates/index_testrunb.html b/templates/index_testrunb.html index b4ef7ecca14d8dafb1a70eb89ffa153c2cdea234..ddee9cf0d865b30d81383923e0de623733f27eed 100644 --- a/templates/index_testrunb.html +++ b/templates/index_testrunb.html @@ -1 +1 @@ -%(name)s +%(name)s
(info) diff --git a/templates/testrun.html b/templates/testrun.html new file mode 100644 index 0000000000000000000000000000000000000000..a04ec0d01176cda484fde1fca9926cbf592c6fa1 --- /dev/null +++ b/templates/testrun.html @@ -0,0 +1,22 @@ + + + %(name)s - System info + + + +

System info for %(name)s

+

+ Back to summary +

+ + + + + + %(details)s +
DetailValue
+

+ Back to summary +

+ +