diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-05-31 15:40:10 +0530 | 
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-05-31 15:40:10 +0530 | 
| commit | f56b402a5b98fbb2c2f3af4ebdac3f53313c5ab1 (patch) | |
| tree | 6b34356b429ef9282214ed80ba6437a72944cf41 /run_tests.py | |
| parent | 05f8b1bd7829c425a8a4838394b8c2d5964c7553 (diff) | |
| download | meson-f56b402a5b98fbb2c2f3af4ebdac3f53313c5ab1.tar.gz | |
Revert "mesonlib: handle meson exe wrappers"
This reverts commit 0627e9d616dc311b7c9b0ef17301f680ac9e78a7.
Breaks installation: https://github.com/mesonbuild/meson/issues/3647
Will be restored once that can be fixed.
Diffstat (limited to 'run_tests.py')
| -rwxr-xr-x | run_tests.py | 22 | 
1 files changed, 0 insertions, 22 deletions
diff --git a/run_tests.py b/run_tests.py index 731d864fc..648e6ce1e 100755 --- a/run_tests.py +++ b/run_tests.py @@ -42,28 +42,6 @@ if mesonlib.is_windows() or mesonlib.is_cygwin():  else:      exe_suffix = '' -def setup_pythonpath(): -    # Make sure python can import mesonbuild, even if we change directories as -    # some tests do. Since sys.path is the final product of fairly complex code -    # in site.py, it's hard to tell where each entry came from just by looking -    # at sys.path, so we don't know if a given entry was set from a relative or -    # absolute path. If an entry was set from a relative path, it won't -    # continue to work if we change directories.  Instead of trying to guess -    # where a given entry came from, just add the known-good mesonbuild to -    # PYTHONPATH so that it will continue to be importable from other -    # directories. -    import mesonbuild -    meson_dir = os.path.dirname(os.path.abspath(mesonbuild.__file__)) -    meson_root = os.path.realpath(os.path.join(meson_dir, os.pardir)) -    try: -        python_path = os.environ['PYTHONPATH'] -    except KeyError: -        python_path = meson_root -    else: -        paths = python_path.split(os.pathsep) + [meson_root] -        python_path = os.pathsep.join(paths) -    os.environ['PYTHONPATH'] = python_path -  def get_backend_args_for_dir(backend, builddir):      '''      Visual Studio backend needs to be given the solution to build  | 
