aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Brunet <charles.brunet@optelgroup.com>2023-06-14 09:38:21 -0400
committerEli Schwartz <eschwartz@archlinux.org>2023-06-16 02:11:02 -0400
commit35291c967200222b30dd87b2e8e2878794bc4bec (patch)
treeeef67d7817b1a750a03e2188bae7f4d513a16e5a
parent92592015bb04bde1f36d46c53fe09ae38f678be8 (diff)
downloadmeson-35291c967200222b30dd87b2e8e2878794bc4bec.zip
meson-35291c967200222b30dd87b2e8e2878794bc4bec.tar.gz
meson-35291c967200222b30dd87b2e8e2878794bc4bec.tar.bz2
unittests: fix test_scripts_loaded_modules matching exactly our own modules
When meson is installed as editable, setuptools adds `__editable___meson_1_0_99_finder` to the list. This contains the string "meson" which isn't really accurate to what we want, which is modules that are part of the `mesonbuild.*` namespace.
-rw-r--r--unittests/allplatformstests.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py
index a57ca0c..6405360 100644
--- a/unittests/allplatformstests.py
+++ b/unittests/allplatformstests.py
@@ -4693,7 +4693,7 @@ class AllPlatformTests(BasePlatformTests):
cmd = self.meson_command + ['--internal', 'test_loaded_modules', '--unpickle', str(p)]
p = subprocess.run(cmd, stdout=subprocess.PIPE)
all_modules = json.loads(p.stdout.splitlines()[0])
- meson_modules = [m for m in all_modules if 'meson' in m]
+ meson_modules = [m for m in all_modules if m.startswith('mesonbuild')]
expected_meson_modules = [
'mesonbuild',
'mesonbuild._pathlib',