diff --git a/runtests.py b/runtests.py index d684f86f..359273ef 100755 --- a/runtests.py +++ b/runtests.py @@ -70,18 +70,24 @@ astdatadir = ast_config.directories["astdatadir"] or '/var/lib/asterisk' if astdatadir[0] == os.path.sep: astdatadir = astdatadir[1:] -pjproject_lib = os.path.join(os.getenv("AST_TEST_ROOT") or os.path.sep, astdatadir, "third-party/pjproject") -if os.path.exists(pjproject_lib): - # runtests.py needs pjproject_lib for the dependency checks. - sys.path.append(pjproject_lib) - # And of course, the tests need it. - new_PYTHONPATH.append(pjproject_lib) +pjproject_bin = os.path.join(os.getenv("AST_TEST_ROOT") or os.path.sep, astdatadir, "third-party/pjproject") +if os.path.exists(pjproject_bin): new_SYSPATH = [] if os.getenv("PATH"): new_SYSPATH.append(os.getenv("PATH")) - new_SYSPATH.append(pjproject_lib) + new_SYSPATH.append(pjproject_bin) os.environ['PATH'] = os.pathsep.join(new_SYSPATH) + if sys.version_info[0] == 2: + pjproject_lib = os.path.join(pjproject_bin, 'py2') + else: + pjproject_lib = os.path.join(pjproject_bin, 'py3') + if os.path.exists(pjproject_lib): + # runtests.py needs pjproject_lib for the dependency checks. + sys.path.append(pjproject_lib) + # And of course, the tests need it. + new_PYTHONPATH.append(pjproject_lib) + # If True, abandon the current running TestRun. Used by SIGTERM. abandon_test = False