From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Thu, 2 Dec 2010 15:38:43 +0000 (+0100)
Subject: Working version of genhtml
X-Git-Tag: fix-allnoconfig~273^2~1
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/commitdiff_plain/021af783fe6308935144830af5f51842352bf395

Working version of genhtml
---

diff --git a/gw-tests/genhtml/Makefile b/gw-tests/genhtml/Makefile
index 6801004..17e0f2b 100644
--- a/gw-tests/genhtml/Makefile
+++ b/gw-tests/genhtml/Makefile
@@ -1,2 +1,2 @@
 test:
-	./wvtestrun ./wvtest.py genhtml.py
+	./wvtestrun ./wvtest.py genhtml-test.py
diff --git a/gw-tests/genhtml/genhtml-test.py b/gw-tests/genhtml/genhtml-test.py
new file mode 100644
index 0000000..7d77fba
--- /dev/null
+++ b/gw-tests/genhtml/genhtml-test.py
@@ -0,0 +1,66 @@
+from wvtest import *
+from genhtml import *
+
+@wvtest
+def Dimension_and_DimValue():
+    d = Dimension('kern', 'Kernel')
+    d.addValue('2.6.31')
+    d.addValue('2.6.30')
+    l=[]
+    for v in d:
+        WVPASSEQ(v.__class__, DimValue)
+        l.append(v.value)
+    lsorted = ['2.6.30', '2.6.31']
+    WVPASSEQ(l, lsorted)
+    WVPASSEQ(v.htmlLabel(), '2.6.31')
+    WVPASSEQ(d['2.6.31'].value, '2.6.31')
+    
+@wvtest                
+def Two_Dimensions_in_Tests():
+    t = Tests(None, DimensionTest(), DimensionKern())
+    WVPASSEQ([(a.__class__.__name__, b.__class__.__name__) for a, b in t.iterDimensionPairs()],
+             [('DimensionTest', 'DimensionKern'), ('DimensionKern', 'DimensionTest')])
+@wvtest                
+def Three_Dimensions_in_Tests():
+    dt = DimensionTest()
+    dk = DimensionKern()
+    dd = Dimension('tmp', "Tmp")
+    t = Tests(None, dt, dk, dd)
+    pairs = [(a.__class__.__name__, b.__class__.__name__) for a, b in t.iterDimensionPairs()]
+    WVPASSEQ(pairs[0], ('DimensionTest', 'DimensionKern'))
+    WVPASSEQ(pairs[1], ('DimensionKern', 'DimensionTest'))
+    WVPASSEQ(pairs[2], ('DimensionTest', 'Dimension'))
+    WVPASSEQ(pairs[3], ('Dimension', 'DimensionTest'))
+    WVPASSEQ(pairs[4], ('DimensionKern', 'Dimension'))
+    WVPASSEQ(pairs[5], ('Dimension', 'DimensionKern'))
+    WVPASSEQ(len(pairs), 6)
+    WVEXCEPT(KeyError, t.addTest, None, [1, 2])
+    WVEXCEPT(KeyError, t.addTest, None, [1, 2, 3, 4])
+
+    class MyTest(Test):
+        pass
+
+    t.addTest(MyTest, [1, 'a', 'A']);
+
+    WVPASSEQ(dt.keys(), [1])
+    WVPASSEQ(dk.keys(), ['a'])
+    WVPASSEQ(dd.keys(), ['A'])
+
+    v1 = dt[1]
+    v2 = dk['a']
+    v3 = dd['A']
+
+    WVPASSEQ(t.getTest((v1, v2, v3)), MyTest)
+    WVPASSEQ(t.getTest((v1, v3, v2)), MyTest)
+    WVPASSEQ(t.getTest((v3, v2, v1)), MyTest)
+    WVEXCEPT(KeyError, t.getTest, (v1, v1, v1))
+    WVEXCEPT(KeyError, t.getTest, (v1, v2))
+    WVEXCEPT(TypeError, t.getTest, v1)
+
+    WVPASSEQ([d.__class__.__name__ for d in t.iterRemainingDimensions([dt])], ['DimensionKern', 'Dimension']) 
+    WVPASSEQ([d.__class__.__name__ for d in t.iterRemainingDimensions([dt, dd])], ['DimensionKern'])
+
+    WVPASSEQ(str([v for v in iterDimValues([dt, dk])]), str([[1,'a']]))
+    dt.addValue(2)
+    dk.addValue('b')
+    WVPASSEQ(str([v for v in iterDimValues([dt, dk])]), str([[1, 'a'], [2, 'a'], [1, 'b'], [2, 'b']]))
diff --git a/gw-tests/genhtml/genhtml.py b/gw-tests/genhtml/genhtml.py
old mode 100644
new mode 100755
index 3a90ab5..90c4e5f
--- a/gw-tests/genhtml/genhtml.py
+++ b/gw-tests/genhtml/genhtml.py
@@ -1,15 +1,10 @@
 #!/usr/bin/env python
-
+# -*- coding: utf-8 -*-
 import os;
 import dircache;
 import sys;
 import urllib
 
-if __name__ == "__main__":
-    os.chdir(sys.argv[1])
-else:
-    from wvtest import *
-
 class DimValue:
     def __init__(self, dim, value):
         self.dim = dim
@@ -40,21 +35,6 @@ class Dimension(dict):
     def htmlLabel(self, v):
         return v
 
-@wvtest
-def Dimension_and_DimValue():
-    d = Dimension('kern', 'Kernel')
-    d.addValue('2.6.31')
-    d.addValue('2.6.30')
-    l=[]
-    for v in d:
-        WVPASSEQ(v.__class__, DimValue)
-        l.append(v.value)
-    lsorted = ['2.6.30', '2.6.31']
-    WVPASSEQ(l, lsorted)
-    WVPASSEQ(v.htmlLabel(), '2.6.31')
-    WVPASSEQ(d['2.6.31'].value, '2.6.31')
-    
-
 class DimensionKern(Dimension):
     def __init__(self):
         Dimension.__init__(self, 'kern', 'Kernel')
@@ -83,6 +63,10 @@ class Test:
         return os.path.isfile(f)
     def __init__(self, path):
         self.path = path
+    def printThumbLink(self, file):
+        for img in dircache.listdir(self.path+'/thumb'):
+            print >>file, "<a href='%s/%s'><img src='%s/thumb/%s'></a>" % \
+                (urllib.quote(self.path), img, urllib.quote(self.path), img)
 
 def iterDimValues(dimensions):
     idx = [0 for i in xrange(len(dimensions))]
@@ -143,16 +127,31 @@ class Tests(dict):
                 yield d
     def generateHtml(self):
         for pair in self.iterDimensionPairs():
-            remdims = self.iterRemainingDimensions(pair)
+            remdims = [d for d in self.iterRemainingDimensions(pair)]
             for vals in iterDimValues(remdims):
-                self.generatePage(pair, remdims, vals)
-
-    def generatePage(self, dimpair, dimother, valsother):
-        dimy, dimx = dimpair
-        html = open("%s-vs-%s-%s.html"%(dimy.type, dimx.type, "-".join([v.value for v in valsother])), "w")
-        title = "CAN gateway benchmark for " + ", ".join([v.dim.name+" "+v.value for v in valsother])
+                page = Page(pair, remdims, vals, self)
+                page.generate()
+        try:
+            os.remove("index.html")
+        except OSError: pass
+        os.symlink(page.getName(), "index.html")
+
+        os.system("source-highlight -d --output-dir=. ../*.sh")
+
+class Page:
+    def __init__(self, dimPair, dimOther, valsOther, tests):
+        self.dimy, self.dimx = dimPair
+        self.dimOther = dimOther
+        self.valsOther = valsOther
+        self.tests = tests
+    def getName(self):
+        return "%s-vs-%s-%s.html"%(self.dimy.type, self.dimx.type, "-".join([v.value for v in self.valsOther]))
+    def generate(self):
+        html = open(self.getName(), "w")
+        title = "CAN gateway timing analysis" + ", ".join([v.dim.name+" "+v.value for v in self.valsOther])
         print >> html, """<html>
-<head>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> 
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>%s</title>
 <style>
 img { border: 0; }
@@ -162,7 +161,7 @@ th, td { border: 1px solid lightgray; padding: 4px;}
 </head>
 <body>
 <h1>%s</h1>"""  % (title, title)
-        for d in dimother:
+        for d in self.dimOther:
             pass
 #             print >>html, "View for %s: " % str(ps.pageclass.name)
 #             for v in ps.values:
@@ -174,134 +173,30 @@ th, td { border: 1px solid lightgray; padding: 4px;}
 #                 pass
 
         print >>html, "<table><thead><tr><td> </td>"
-        for x in dimx.values():
+        for x in self.dimx:
             print >>html, "<th>%s</th>" % x.htmlLabel()
         print >>html, "</tr></thead>"
-        for y in dimy.values():
+        for y in self.dimy:
             print >>html, "<tr><th>%s</th>" % y.htmlLabel()
 
-            for x in dimx.values():
+            for x in self.dimx:
                 print >>html, "<td>"
-                idx = valsother
-                idx.extend([x,y])
-                test = self.getTest(idx)
-                
-                d="by-%s/%s/%s/%s/" % (self.prefix, self.value, y, x)
-                dthumb = d+"thumb"
-                try:
-                    for img in dircache.listdir(dthumb):
-                        print >>html, "<a href='%s/%s'><img src='%s/thumb/%s'></a>" % (urllib.quote(d), img, urllib.quote(d), img)
-                except OSError:
-                    print "warning: no images in %s?"%dthumb
+                idx = [x,y]
+                idx.extend(self.valsOther)
+                test = tests.getTest(idx)
+                test.printThumbLink(html)
                 print >>html, "</td>"
             print >>html, "</tr>"
         print >> html, """
 </table>
+<div style="font-size: small; color: gray; margin-top: 1em;">Authors: Michal Sojka, Pavel Píša, Copyright © 2010 Czech Technical University in Prague</div>
 </body>
 """
 
-@wvtest                
-def Two_Dimensions_in_Tests():
-    t = Tests(None, DimensionTest(), DimensionKern())
-    WVPASSEQ([(a.__class__.__name__, b.__class__.__name__) for a, b in t.iterDimensionPairs()],
-             [('DimensionTest', 'DimensionKern'), ('DimensionKern', 'DimensionTest')])
-@wvtest                
-def Three_Dimensions_in_Tests():
-    dt = DimensionTest()
-    dk = DimensionKern()
-    dd = Dimension('tmp', "Tmp")
-    t = Tests(None, dt, dk, dd)
-    pairs = [(a.__class__.__name__, b.__class__.__name__) for a, b in t.iterDimensionPairs()]
-    WVPASSEQ(pairs[0], ('DimensionTest', 'DimensionKern'))
-    WVPASSEQ(pairs[1], ('DimensionKern', 'DimensionTest'))
-    WVPASSEQ(pairs[2], ('DimensionTest', 'Dimension'))
-    WVPASSEQ(pairs[3], ('Dimension', 'DimensionTest'))
-    WVPASSEQ(pairs[4], ('DimensionKern', 'Dimension'))
-    WVPASSEQ(pairs[5], ('Dimension', 'DimensionKern'))
-    WVPASSEQ(len(pairs), 6)
-    WVEXCEPT(KeyError, t.addTest, None, [1, 2])
-    WVEXCEPT(KeyError, t.addTest, None, [1, 2, 3, 4])
-
-    class MyTest(Test):
-        pass
-
-    t.addTest(MyTest, [1, 'a', 'A']);
-
-    WVPASSEQ(dt.keys(), [1])
-    WVPASSEQ(dk.keys(), ['a'])
-    WVPASSEQ(dd.keys(), ['A'])
-
-    v1 = dt[1]
-    v2 = dk['a']
-    v3 = dd['A']
-
-    WVPASSEQ(t.getTest((v1, v2, v3)), MyTest)
-    WVPASSEQ(t.getTest((v1, v3, v2)), MyTest)
-    WVPASSEQ(t.getTest((v3, v2, v1)), MyTest)
-    WVEXCEPT(KeyError, t.getTest, (v1, v1, v1))
-    WVEXCEPT(KeyError, t.getTest, (v1, v2))
-    WVEXCEPT(TypeError, t.getTest, v1)
-
-    WVPASSEQ([d.__class__.__name__ for d in t.iterRemainingDimensions([dt])], ['DimensionKern', 'Dimension']) 
-    WVPASSEQ([d.__class__.__name__ for d in t.iterRemainingDimensions([dt, dd])], ['DimensionKern'])
-
-    WVPASSEQ(str([v for v in iterDimValues([dt, dk])]), str([[1,'a']]))
-    dt.addValue(2)
-    dk.addValue('b')
-    WVPASSEQ(str([v for v in iterDimValues([dt, dk])]), str([[1, 'a'], [2, 'a'], [1, 'b'], [2, 'b']]))
-
-
-# tests = Tests("by-kern/", DimensionKern(), DimensionTest())
-    
-# sys.exit(0)
 
+if __name__ == "__main__":
+    os.chdir(sys.argv[1])
+    tests = Tests("by-kern/", DimensionKern(), DimensionTest())
+    tests.generateHtml()
+    sys.exit(0)
 
-
-# class Page:
-#     def __init__(self, tests, yaxis, xaxis=None):
-
-# class PageKern(Page):
-#     prefix = 'kern'
-#     name = 'kernel'
-#     def __init__(self, value, xvals, yvals):
-#         Page.__init__(self, value, xvals, yvals)
-#     def getPreambule(self):
-#         i=self.value.find(":")
-#         if i>0: kver=self.value[:i]
-#         else: kver=self.value
-#         return "<p><a href='config-%s'>Kernel config</a></p>"%kver
-
-# class PageClck(Page):
-#     prefix = 'clck'
-#     name = 'CPU clock'
-#     def __init__(self, value, xvals, yvals):
-#         Page.__init__(self, value, xvals, yvals)
-
-# class PageTest(Page):
-#     prefix = 'test'
-#     name = 'test'
-#     def __init__(self, value, xvals, yvals):
-#         Page.__init__(self, value, xvals, yvals)
-#     def getPreambule(self):
-#         return "<p><a href='%s.sh.html'>Test source</a></p>"%(urllib.quote(self.value))
-
-
-
-# pagesets = [ PageSet(PageKern, kernels, clocks, tests),
-#              PageSet(PageTest, tests, clocks, kernels)]
-
-# for ps in pagesets:
-#     for p in ps.getPages():
-#         p.generate(pagesets)
-
-# try:
-#     os.remove("index.html")
-# except OSError: pass
-
-# os.symlink("%s-%s.html"%(clocks.type, clocks[0]), "index.html")
-
-# os.system("source-highlight -d --output-dir=. ../*.sh")
-    
-
-# for v in kernels.versions():
-#     os.system("cp /boot/config-%s ."%v)