summaryrefslogtreecommitdiff
path: root/test cases/unit
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2018-09-18 15:17:31 -0700
committerDylan Baker <dylan@pnwbakers.com>2018-11-14 15:57:37 -0800
commit71a5f990d09f04d8eb8d636abf7e2b446fdf826a (patch)
treec9b4b3d5f45df4ff9340c26c35a909aef19bd424 /test cases/unit
parent091452f8cd886dedc2bc5d3ec292dcf899989a24 (diff)
downloadmeson-71a5f990d09f04d8eb8d636abf7e2b446fdf826a.tar.gz
modules/python: Allow use of the native file
Currently this just allows setting a "python" variable that always overrides, probably we want to have the option for "python2" and "python3" as well.
Diffstat (limited to 'test cases/unit')
-rw-r--r--test cases/unit/46 native file binary/meson.build4
-rw-r--r--test cases/unit/46 native file binary/meson_options.txt2
2 files changed, 5 insertions, 1 deletions
diff --git a/test cases/unit/46 native file binary/meson.build b/test cases/unit/46 native file binary/meson.build
index 76d69835a..4489ac1e6 100644
--- a/test cases/unit/46 native file binary/meson.build
+++ b/test cases/unit/46 native file binary/meson.build
@@ -14,4 +14,8 @@ elif case == 'python3'
prog = import('python3').find_python()
result = run_command(prog, ['--version'])
assert(result.stdout().strip().endswith('12345'), 'Didn\'t load python3 from config file')
+elif case == 'python'
+ prog = import('python').find_installation()
+ result = run_command(prog, ['--version'])
+ assert(result.stdout().strip().endswith('12345'), 'Didn\'t load python from config file')
endif
diff --git a/test cases/unit/46 native file binary/meson_options.txt b/test cases/unit/46 native file binary/meson_options.txt
index ef7fe0228..651da0ebe 100644
--- a/test cases/unit/46 native file binary/meson_options.txt
+++ b/test cases/unit/46 native file binary/meson_options.txt
@@ -1,5 +1,5 @@
option(
'case',
type : 'combo',
- choices : ['find_program', 'config_dep', 'python3']
+ choices : ['find_program', 'config_dep', 'python3', 'python']
)