diff options
17 files changed, 23 insertions, 23 deletions
diff --git a/test cases/common/106 multiple dir configure file/subdir/meson.build b/test cases/common/106 multiple dir configure file/subdir/meson.build index 503df96..8947585 100644 --- a/test cases/common/106 multiple dir configure file/subdir/meson.build +++ b/test cases/common/106 multiple dir configure file/subdir/meson.build @@ -3,7 +3,7 @@ configure_file(input : 'someinput.in', install : false, copy: true) -py3 = import('python3').find_python() +py3 = import('python').find_installation() cfile1 = configure_file(input : 'foo.txt', output : 'foo.h.in', diff --git a/test cases/common/109 custom target capture/meson.build b/test cases/common/109 custom target capture/meson.build index 58a69ca..6eb80e6 100644 --- a/test cases/common/109 custom target capture/meson.build +++ b/test cases/common/109 custom target capture/meson.build @@ -1,6 +1,6 @@ project('custom target', 'c') -python3 = import('python3').find_python() +python3 = import('python').find_installation() # Note that this will not add a dependency to the compiler executable. # Code will not be rebuilt if it changes. diff --git a/test cases/common/128 build by default targets in tests/meson.build b/test cases/common/128 build by default targets in tests/meson.build index 5cc5055..d6cdaee 100644 --- a/test cases/common/128 build by default targets in tests/meson.build +++ b/test cases/common/128 build by default targets in tests/meson.build @@ -19,5 +19,5 @@ if not os.path.exists(sys.argv[1]) or not os.path.exists(sys.argv[2]): "".format(sys.argv[1], sys.argv[2], os.getcwd())) sys.exit(1)''' -python = import('python3').find_python() +python = import('python').find_installation() test('output-check', python, args : ['-c', py_file_exists, foo_out, exe_out]) diff --git a/test cases/common/129 build by default/meson.build b/test cases/common/129 build by default/meson.build index b797f76..aab4b4d 100644 --- a/test cases/common/129 build by default/meson.build +++ b/test cases/common/129 build by default/meson.build @@ -1,7 +1,7 @@ project('build on all', 'c') -py3_mod = import('python3') -py3 = py3_mod.find_python() +py_mod = import('python') +py3 = py_mod.find_installation() executable('fooprog', 'foo.c', build_by_default : false, diff --git a/test cases/common/139 mesonintrospect from scripts/meson.build b/test cases/common/139 mesonintrospect from scripts/meson.build index a83b533..366c89f 100644 --- a/test cases/common/139 mesonintrospect from scripts/meson.build +++ b/test cases/common/139 mesonintrospect from scripts/meson.build @@ -1,6 +1,6 @@ project('mesonintrospect from scripts', 'c') -python = import('python3').find_python() +python = import('python').find_installation() ret = run_command(python, ['check_env.py', '1'], check: false) if ret.returncode() == 0 diff --git a/test cases/common/14 configure file/meson.build b/test cases/common/14 configure file/meson.build index 91a56ff..b5dae4a 100644 --- a/test cases/common/14 configure file/meson.build +++ b/test cases/common/14 configure file/meson.build @@ -29,7 +29,7 @@ configure_file(input : files('config.h.in'), configuration : conf) # Now generate a header file with an external script. -genprog = import('python3').find_python() +genprog = import('python').find_installation() scriptfile = '@0@/generator.py'.format(meson.current_source_dir()) ifile = '@0@/dummy.dat'.format(meson.current_source_dir()) ofile = '@0@/config2.h'.format(meson.current_build_dir()) diff --git a/test cases/common/141 special characters/meson.build b/test cases/common/141 special characters/meson.build index 579601e..3dac359 100644 --- a/test cases/common/141 special characters/meson.build +++ b/test cases/common/141 special characters/meson.build @@ -1,6 +1,6 @@ project('ninja special characters' ,'c') -python = import('python3').find_python() +python = import('python').find_installation() # Without newlines, this should appear directly in build.ninja. gen = custom_target('gen', diff --git a/test cases/common/143 list of file sources/meson.build b/test cases/common/143 list of file sources/meson.build index 819509d..d90f4af 100644 --- a/test cases/common/143 list of file sources/meson.build +++ b/test cases/common/143 list of file sources/meson.build @@ -1,7 +1,7 @@ project('test', 'c') -mod_py = import('python3') -python = mod_py.find_python() +mod_py = import('python') +python = mod_py.find_installation() test_target = custom_target( 'test_target', diff --git a/test cases/common/150 reserved targets/meson.build b/test cases/common/150 reserved targets/meson.build index 24fd937..a68642e 100644 --- a/test cases/common/150 reserved targets/meson.build +++ b/test cases/common/150 reserved targets/meson.build @@ -26,7 +26,7 @@ subdir('uninstall') subdir('runtarget') -py3 = import('python3').find_python() +py3 = import('python').find_installation() custom_target('ctlist-test', output : 'out.txt', command : [py3, '-c', 'print("")'], diff --git a/test cases/common/152 index customtarget/meson.build b/test cases/common/152 index customtarget/meson.build index efddfac..bcb85cd 100644 --- a/test cases/common/152 index customtarget/meson.build +++ b/test cases/common/152 index customtarget/meson.build @@ -14,8 +14,8 @@ project('custom_target_index', 'c', default_options : 'c_std=c89') -py_mod = import('python3') -prog_python = py_mod.find_python() +py_mod = import('python') +prog_python = py_mod.find_installation() gen = custom_target( 'gen.[ch]', diff --git a/test cases/common/242 custom target feed/meson.build b/test cases/common/242 custom target feed/meson.build index 1cda37d..e9cd2b6 100644 --- a/test cases/common/242 custom target feed/meson.build +++ b/test cases/common/242 custom target feed/meson.build @@ -1,6 +1,6 @@ project('custom target feed', 'c') -python3 = import('python3').find_python() +python3 = import('python').find_installation() # Note that this will not add a dependency to the compiler executable. # Code will not be rebuilt if it changes. diff --git a/test cases/common/33 run program/meson.build b/test cases/common/33 run program/meson.build index aa0a1d6..4671a2b 100644 --- a/test cases/common/33 run program/meson.build +++ b/test cases/common/33 run program/meson.build @@ -55,7 +55,7 @@ if c.returncode() != 0 error('Using files() in argument failed.') endif -py3 = import('python3').find_python() +py3 = import('python').find_installation() ret = run_command(py3, '-c', 'print("some output")', check: false) assert(ret.returncode() == 0, 'failed to run python3: ' + ret.stderr()) diff --git a/test cases/common/95 manygen/subdir/meson.build b/test cases/common/95 manygen/subdir/meson.build index 56f60e6..a734013 100644 --- a/test cases/common/95 manygen/subdir/meson.build +++ b/test cases/common/95 manygen/subdir/meson.build @@ -1,5 +1,5 @@ gen = files('manygen.py') -py3_bin = import('python3').find_python() +py3_bin = import('python').find_installation() buildtype = get_option('buildtype') buildtype_args = '-Dfooxxx' # a useless compiler argument diff --git a/test cases/common/97 find program path/meson.build b/test cases/common/97 find program path/meson.build index edb6493..47cacb2 100644 --- a/test cases/common/97 find program path/meson.build +++ b/test cases/common/97 find program path/meson.build @@ -1,6 +1,6 @@ project('find program', 'c') -python = import('python3').find_python() +python = import('python').find_installation() # Source file via string prog = find_program('program.py') diff --git a/test cases/csharp/2 library/meson.build b/test cases/csharp/2 library/meson.build index 6b246a4..468c670 100644 --- a/test cases/csharp/2 library/meson.build +++ b/test cases/csharp/2 library/meson.build @@ -1,6 +1,6 @@ project('C# library', 'cs') -python3 = import('python3').find_python() +python3 = import('python').find_installation() generated_sources = custom_target('gen_sources', input: 'helper.cs', output: 'helper.cs', diff --git a/test cases/frameworks/11 gir subproject/meson.build b/test cases/frameworks/11 gir subproject/meson.build index 3714daa..e39816f 100644 --- a/test cases/frameworks/11 gir subproject/meson.build +++ b/test cases/frameworks/11 gir subproject/meson.build @@ -5,8 +5,8 @@ if not gir.found() error('MESON_SKIP_TEST g-ir-scanner not found.') endif -python3 = import('python3') -py3 = python3.find_python() +python3 = import('python') +py3 = python3.find_installation() if run_command(py3, '-c', 'import gi;', check: false).returncode() != 0 error('MESON_SKIP_TEST python3-gi not found') endif diff --git a/test cases/frameworks/7 gnome/meson.build b/test cases/frameworks/7 gnome/meson.build index 9f86406..6bf6db1 100644 --- a/test cases/frameworks/7 gnome/meson.build +++ b/test cases/frameworks/7 gnome/meson.build @@ -10,8 +10,8 @@ if not gir.found() error('MESON_SKIP_TEST gobject-introspection not found.') endif -python3 = import('python3') -py3 = python3.find_python() +python3 = import('python') +py3 = python3.find_installation() if run_command(py3, '-c', 'import gi;', check: false).returncode() != 0 error('MESON_SKIP_TEST python3-gi not found') endif @@ -25,7 +25,7 @@ if cc.get_id() == 'intel' add_global_arguments('-wd2282', language : 'c') endif -py3 = import('python3').find_python() +py3 = import('python').find_installation() pycode = '''import os, sys if "MESON_UNIT_TEST_PRETEND_GLIB_OLD" in os.environ: sys.exit(0) |