Allow calling `make html` when results is a symlink

diff --git a/gw-tests/Makefile b/gw-tests/Makefile
index c0bec58a7b41159122b2aff31fb777f9f98f70d6..5ecb187dea71dab29e2aab3148bd685516f6558b 100644 (file)
--- a/gw-tests/Makefile
+++ b/gw-tests/Makefile
@@ -39,7 +39,7 @@ RTEMS:
 
 .PHONY: html
 html:
 
 .PHONY: html
 html:

-       ./genhtml/genhtml.py results
+       ./genhtml/genhtml.py results $(CURDIR)

 
 KERNELS=2.6.33.7-00007-g9c0ff90 2.6.33.7-rt29-00004-g92487e4 2.6.36.2-00015-g4f1bc4e 3.0.4-00007-g1c8c373 3.0.4-rt14-00008-gb2052fd
 
 
 KERNELS=2.6.33.7-00007-g9c0ff90 2.6.33.7-rt29-00004-g92487e4 2.6.36.2-00015-g4f1bc4e 3.0.4-00007-g1c8c373 3.0.4-rt14-00008-gb2052fd
 

diff --git a/gw-tests/genhtml/genhtml.py b/gw-tests/genhtml/genhtml.py
index 811b7359e6634b10a7487e3b423825d3793bd97f..82a123020dd08ee671448058aa318dcd245f08fa 100755 (executable)
--- a/gw-tests/genhtml/genhtml.py
+++ b/gw-tests/genhtml/genhtml.py
@@ -335,7 +335,7 @@ h4 { margin: 0; }
             print test.path
             test.generateHtml()
 
             print test.path
             test.generateHtml()
 

-       os.system("source-highlight -d --output-dir=. ../*.sh > /dev/null")
+       os.system("source-highlight -d --output-dir=. %s/*.sh > /dev/null" % sh_dir)

 
 class Page(object):
     def __init__(self, dimPair, valsOther, tests):
 
 class Page(object):
     def __init__(self, dimPair, valsOther, tests):


@@ -408,6 +408,7 @@ class Page(object):
 
 if __name__ == "__main__":
     os.chdir(sys.argv[1])
 
 if __name__ == "__main__":
     os.chdir(sys.argv[1])

+    sh_dir = sys.argv[2]

     os.system("rm *.html")
     tests = Tests("./", Space(DimensionHostKern(), DimensionKern(), DimensionTraffic(), DimensionLoad(), DimensionTest()))
     tests.generateHtml()
     os.system("rm *.html")
     tests = Tests("./", Space(DimensionHostKern(), DimensionKern(), DimensionTraffic(), DimensionLoad(), DimensionTest()))
     tests.generateHtml()