From 8976d8ff4ef5357abfe292892163a7002cf72134 Mon Sep 17 00:00:00 2001 From: Andrew Lewis Date: Fri, 19 May 2017 14:07:59 +0200 Subject: [Minor] Fix tests --- test/functional/lib/rspamd.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'test/functional/lib/rspamd.py') diff --git a/test/functional/lib/rspamd.py b/test/functional/lib/rspamd.py index a2be23e87..1ae6e95a1 100644 --- a/test/functional/lib/rspamd.py +++ b/test/functional/lib/rspamd.py @@ -45,19 +45,31 @@ def get_top_dir(): return get_test_directory() + "/../../" +def get_install_root(): + if os.environ.get('RSPAMD_INSTALLROOT'): + return os.path.abspath(os.environ['RSPAMD_INSTALLROOT']) + + return os.path.abspath("../install/") + def get_rspamd(): if os.environ.get('RSPAMD'): return os.environ['RSPAMD'] + if os.environ.get('RSPAMD_INSTALLROOT'): + return os.environ['RSPAMD_INSTALLROOT'] + "/bin/rspamd" dname = get_top_dir() return dname + "/src/rspamd" def get_rspamc(): if os.environ.get('RSPAMC'): return os.environ['RSPAMC'] + if os.environ.get('RSPAMD_INSTALLROOT'): + return os.environ['RSPAMD_INSTALLROOT'] + "/bin/rspamc" dname = get_top_dir() return dname + "/src/client/rspamc" def get_rspamadm(): if os.environ.get('RSPAMADM'): return os.environ['RSPAMADM'] + if os.environ.get('RSPAMD_INSTALLROOT'): + return os.environ['RSPAMD_INSTALLROOT'] + "/bin/rspamadm" dname = get_top_dir() return dname + "/src/rspamadm/rspamadm" -- cgit v1.2.3