summaryrefslogtreecommitdiff
path: root/test cases/common
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2022-05-05 23:39:34 -0400
committerXavier Claessens <xclaesse@gmail.com>2023-02-24 20:45:00 -0500
commitcf07596cf6bc280dac0afff505147ca626c79453 (patch)
treeef7a4ab1e652bca9131f5b53eedcc056b86aa6e1 /test cases/common
parent9f05d45b7084866f0b306f4685a118e5fea138af (diff)
downloadmeson-cf07596cf6bc280dac0afff505147ca626c79453.tar.gz
test cases: use best practices method to find the python3 program
We do not need the python module's find_installation() for this, as this does various things to set up building and installing python modules (pure python and C-API). This functionality is already tested in the python tests. Elsewhere, when we just need an interpreter capable of running python scripts in order to guarantee a useful scripting language for custom commands, it suffices to use find_program(), which does not run an introspection script or do module imports, and is thus faster and a bit cleaner. Either way, both methods are guaranteed to find the python3 interpreter, deferring to mesonlib.python_command for that guarantee. test "71 summary" can sometimes return the python command with the ".exe" part all uppercased for mysterious Windows reasons. Smooth this over with ExternalProgram.
Diffstat (limited to 'test cases/common')
-rw-r--r--test cases/common/257 generated header dep/meson.build2
-rw-r--r--test cases/common/44 pkgconfig-gen/meson.build2
2 files changed, 2 insertions, 2 deletions
diff --git a/test cases/common/257 generated header dep/meson.build b/test cases/common/257 generated header dep/meson.build
index 195d082ac..82db3b228 100644
--- a/test cases/common/257 generated header dep/meson.build
+++ b/test cases/common/257 generated header dep/meson.build
@@ -8,7 +8,7 @@ project('generated header dep', 'c')
# dependency on the header file. This happened in GLib:
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2917.
-python = import('python').find_installation()
+python = find_program('python3')
header = custom_target(
output: 'foo.h',
capture: true,
diff --git a/test cases/common/44 pkgconfig-gen/meson.build b/test cases/common/44 pkgconfig-gen/meson.build
index 12a110e25..e093e6f87 100644
--- a/test cases/common/44 pkgconfig-gen/meson.build
+++ b/test cases/common/44 pkgconfig-gen/meson.build
@@ -18,7 +18,7 @@ if v.version_compare('<0.29')
error('MESON_SKIP_TEST: pkg-config version \'' + v + '\' too old')
endif
-python = import('python').find_installation()
+python = find_program('python3')
fs = import('fs')
pkgg = import('pkgconfig')