[tests] fix path issues

personal/stbuehler/wip
Stefan Bühler 9 years ago
parent f64ba1bb72
commit a034e05eff
  1. 7
      tests/base.py
  2. 2
      tests/runtests.py
  3. 2
      tests/service.py
  4. 2
      tests/t-cgi.py

@ -399,15 +399,16 @@ cache.disk.etag "{cache_disk_etag_dir}";
if Env.valgrind:
valgrindconfig = """
env ( "G_SLICE=always-malloc", "G_DEBUG=gc-friendly,fatal-criticals" );
wrapper ("/usr/bin/valgrind" );
# wrapper ("/usr/bin/valgrind", "--leak-check=full", "--show-reachable=yes", "--leak-resolution=high" );
"""
wrapper ("{valgrind}" );
# wrapper ("{valgrind}", "--leak-check=full", "--show-reachable=yes", "--leak-resolution=high" );
""".format(valgrind = Env.valgrind)
Env.angelconf = self.PrepareFile("conf/angel.conf", """
instance {{
binary "{Env.worker}";
config "{Env.lighttpdconf}";
modules "{Env.plugindir}";
copy-env ("PATH");
{valgrindconfig}
}}

@ -79,6 +79,8 @@ Env.no_angel = options.no_angel
Env.debug = options.debug
Env.wait = options.wait
Env.valgrind = options.valgrind
if Env.valgrind:
Env.valgrind = which('valgrind')
Env.color = sys.stdin.isatty()
Env.COLOR_RESET = Env.color and "\033[0m" or ""

@ -185,7 +185,7 @@ class Lighttpd(Service):
self.portfree(base.Env.port)
if base.Env.no_angel:
if base.Env.valgrind:
self.fork('valgrind', base.Env.worker, '-m', base.Env.plugindir, '-c', base.Env.lighttpdconf)
self.fork(base.Env.valgrind, base.Env.worker, '-m', base.Env.plugindir, '-c', base.Env.lighttpdconf)
else:
self.fork(base.Env.worker, '-m', base.Env.plugindir, '-c', base.Env.lighttpdconf)
else:

@ -32,8 +32,6 @@ printf '%s' "${val}"
SCRIPT_UPLOADCHECK="""#!/bin/sh
# need /sbin for /sbin/sha1 on FreeBSD (and probably others)
export PATH="/sbin:/usr/sbin:/usr/local/sbin:${PATH}"
SHA1SUM=$(which sha1sum sha1)
if [ ! -x "${SHA1SUM}" ]; then

Loading…
Cancel
Save