From d5e3695ea29dc822d990121ebbf06bffb8a3247d Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 22 Jan 2021 08:05:09 +1000 Subject: [PATCH] test: fill in srcdir/builddir when not set in the environment Makes this test easier to run from the commandline. Where either of top_srcdir or top_builddir isn't set, fill them in from the CWD or fail otherwise. Signed-off-by: Peter Hutterer --- test/tool-option-parsing.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/test/tool-option-parsing.py b/test/tool-option-parsing.py index a2072b3..9b7d008 100755 --- a/test/tool-option-parsing.py +++ b/test/tool-option-parsing.py @@ -31,8 +31,19 @@ import tempfile import unittest -top_builddir = os.environ['top_builddir'] -top_srcdir = os.environ['top_srcdir'] +try: + top_builddir = os.environ['top_builddir'] + top_srcdir = os.environ['top_srcdir'] +except KeyError: + print('Required environment variables not found: top_srcdir/top_builddir', file=sys.stderr) + from pathlib import Path + top_srcdir = '.' + try: + top_builddir = next(Path('.').glob('**/meson-logs/')).parent + except StopIteration: + sys.exit(1) + print('Using srcdir "{}", builddir "{}"'.format(top_srcdir, top_builddir), file=sys.stderr) + logging.basicConfig(level=logging.DEBUG) logger = logging.getLogger('test') -- 2.7.4