The branch, master has been updated via b44b5d7 More debug via 3b8cae9 move from cache to cache2 in order to be able to run tests on build.samba.org via c1c68bd Make standalone listen only on localhost and use local version of common.css from d3504da More debug
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit b44b5d78dea6fcf88dbb97e0557b059c391a3c97 Author: Matthieu Patou <m...@matws.net> Date: Mon Nov 8 23:07:21 2010 +0300 More debug commit 3b8cae9833a477ccf7f44369d6ff2f1a0d4dc36e Author: Matthieu Patou <m...@matws.net> Date: Mon Nov 8 23:06:53 2010 +0300 move from cache to cache2 in order to be able to run tests on build.samba.org commit c1c68bde1efdcef7d08f185eb17e9b86b83e25f0 Author: Matthieu Patou <m...@matws.net> Date: Mon Nov 8 23:06:25 2010 +0300 Make standalone listen only on localhost and use local version of common.css ----------------------------------------------------------------------- Summary of changes: buildfarm/data.py | 4 ++-- buildsamba02.fns | 2 ++ web/build.py | 8 +++++--- 3 files changed, 9 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/buildfarm/data.py b/buildfarm/data.py index 74caede..950166a 100644 --- a/buildfarm/data.py +++ b/buildfarm/data.py @@ -343,8 +343,8 @@ class BuildResultStore(object): self.datadir = os.path.join(basedir, "data") check_dir_exists("data", self.datadir) - self.cachedir = os.path.join(basedir, "cache") - check_dir_exists("cache", self.cachedir) + self.cachedir = os.path.join(basedir, "cache2") + check_dir_exists("cache2", self.cachedir) self.lcovdir = os.path.join(basedir, "lcov/data") check_dir_exists("lcov", self.lcovdir) diff --git a/buildsamba02.fns b/buildsamba02.fns index 6ffcfe2..3cef2ad 100644 --- a/buildsamba02.fns +++ b/buildsamba02.fns @@ -7,6 +7,8 @@ global_lock action_test() { echo "PWD: "`pwd` ls -lrta ../../ + set + env case $tree in samba_4*) ../buildtools/bin/waf test diff --git a/web/build.py b/web/build.py index b63061b..590ab38 100755 --- a/web/build.py +++ b/web/build.py @@ -949,8 +949,10 @@ def buildApp(environ, start_response): yield " <meta name='description' contents='Home of the Samba Build Farm, the automated testing facility.'/>" yield " <meta name='robots' contents='noindex'/>" yield " <link rel='stylesheet' href='/build_farm.css' type='text/css' media='all'/>" - #yield " <link rel='stylesheet' href='http://master.samba.org/samba/style/common.css' type='text/css' media='all'/>" - yield " <link rel='stylesheet' href='common.css' type='text/css' media='all'/>" + if standalone: + yield " <link rel='stylesheet' href='common.css' type='text/css' media='all'/>" + else: + yield " <link rel='stylesheet' href='http://master.samba.org/samba/style/common.css' type='text/css' media='all'/>" yield " <link rel='shortcut icon' href='http://www.samba.org/samba/images/favicon.ico'/>" yield " </head>" yield "<body>" @@ -1018,7 +1020,7 @@ if __name__ == '__main__': if opts.standalone: standalone = 1 from wsgiref.simple_server import make_server - httpd = make_server('', 8000, buildApp) + httpd = make_server('localhost', 8000, buildApp) print "Serving on port 8000..." httpd.serve_forever() else: -- build.samba.org