meson: Run the test with Python 3
This is a patch from me and a patch from Mathieu Bridon squashed together. Signed-off-by: Dylan Baker <dylan@pnwbakers.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com> Reviewed-by: Mathieu Bridon <bochecha@daitauha.fr>
This commit is contained in:
parent
ff0ce31e2a
commit
e15686567c
|
@ -64,8 +64,9 @@ if with_tests
|
|||
foreach m : modes
|
||||
test(
|
||||
'glcpp test (@0@)'.format(m),
|
||||
find_program('tests/glcpp_test.py'),
|
||||
prog_python,
|
||||
args : [
|
||||
join_paths(meson.current_source_dir(), 'tests/glcpp_test.py'),
|
||||
glcpp, join_paths(meson.current_source_dir(), 'tests'),
|
||||
'--@0@'.format(m),
|
||||
],
|
||||
|
|
|
@ -84,8 +84,10 @@ test(
|
|||
)
|
||||
|
||||
test(
|
||||
'glsl compiler warnings', find_program('warnings_test.py'),
|
||||
'glsl compiler warnings',
|
||||
prog_python,
|
||||
args : [
|
||||
join_paths(meson.current_source_dir(), 'warnings_test.py'),
|
||||
'--glsl-compiler', glsl_compiler,
|
||||
'--test-directory', join_paths(
|
||||
meson.source_root(), 'src', 'compiler', 'glsl', 'tests', 'warnings'
|
||||
|
@ -94,6 +96,9 @@ test(
|
|||
)
|
||||
test(
|
||||
'glsl optimization',
|
||||
find_program('optimization_test.py'),
|
||||
args : ['--test-runner', glsl_test],
|
||||
prog_python,
|
||||
args : [
|
||||
join_paths(meson.current_source_dir(), 'optimization_test.py'),
|
||||
'--test-runner', glsl_test
|
||||
],
|
||||
)
|
||||
|
|
Loading…
Reference in New Issue