From 69ca8f5b544f700210d9f18613311bcce3c2e37a Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Wed, 12 Oct 2016 19:44:40 +0530 Subject: meson.py: Always resolve full path to meson.py There is no reason to not always do this. Without this, we end up with a relative path to meson.py in build.ninja files when meson.py is launched using subprocess.Popen and friends from the meson source root. This was causing the unittests to intermittently fail when regen was getting invoked by the pic test. Funnily enough, this only happened when run via ./run_tests.py because __file__ was 'run_unittests.py' in that (as opposed to './run_unittests.py') case which made os.path.dirname(__file__) be '', and the os.path.split test in meson.py thought that meson.py was invoked via PATH. --- meson.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'meson.py') diff --git a/meson.py b/meson.py index 4d8a26979..8c223e588 100755 --- a/meson.py +++ b/meson.py @@ -18,10 +18,8 @@ from mesonbuild import mesonmain import sys, os def main(): - launcher = sys.argv[0] - # resolve the command path if not launched from $PATH - if os.path.split(launcher)[0]: - launcher = os.path.realpath(launcher) + # Always resolve the command path so Ninja can find it for regen, tests, etc. + launcher = os.path.realpath(sys.argv[0]) return mesonmain.run(launcher, sys.argv[1:]) if __name__ == '__main__': -- cgit v1.2.3