From a4e76fdb316d3f7901f24f36e077c6936bd679c2 Mon Sep 17 00:00:00 2001 From: Otto Sabart Date: Mon, 10 Oct 2016 10:46:19 +0200 Subject: vsperf: launch should not depend on current $PWD JIRA: VSPERF-392 Change-Id: I44866b7d3298617003b87b015eb08bf32c4014f7 Signed-off-by: Otto Sabart --- vsperf | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'vsperf') diff --git a/vsperf b/vsperf index a12560da..5bfa2abe 100755 --- a/vsperf +++ b/vsperf @@ -54,12 +54,15 @@ VERBOSITY_LEVELS = { 'critical': logging.CRITICAL } -_TEMPLATE_RST = {'head' : 'tools/report/report_head.rst', - 'foot' : 'tools/report/report_foot.rst', +_CURR_DIR = os.path.dirname(os.path.realpath(__file__)) + +_TEMPLATE_RST = {'head' : os.path.join(_CURR_DIR, 'tools/report/report_head.rst'), + 'foot' : os.path.join(_CURR_DIR, 'tools/report/report_foot.rst'), 'final' : 'test_report.rst', - 'tmp' : 'tools/report/report_tmp_caption.rst' + 'tmp' : os.path.join(_CURR_DIR, 'tools/report/report_tmp_caption.rst') } + _LOGGER = logging.getLogger() def parse_arguments(): @@ -482,11 +485,11 @@ def main(): # configure settings - settings.load_from_dir('conf') + settings.load_from_dir(os.path.join(_CURR_DIR, 'conf')) # Load non performance/integration tests if args['integration']: - settings.load_from_dir('conf/integration') + settings.load_from_dir(os.path.join(_CURR_DIR, 'conf/integration')) # load command line parameters first in case there are settings files # to be used -- cgit 1.2.3-korg