OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: Run the test with Python 3

Browse Source 
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:
Mathieu Bridon
2018-08-17 21:32:18 +02:00
committed by Dylan Baker
parent ff0ce31e2a
commit e15686567c
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/compiler/glsl/glcpp/meson.build
View File

@@ -64,8 +64,9 @@ if with_tests
foreach m : modes foreach m : modes
test( test(
'glcpp test (@0@)'.format(m), 'glcpp test (@0@)'.format(m),
find_program('tests/glcpp_test.py'), prog_python,
args : [ args : [
join_paths(meson.current_source_dir(), 'tests/glcpp_test.py'),
glcpp, join_paths(meson.current_source_dir(), 'tests'), glcpp, join_paths(meson.current_source_dir(), 'tests'),
'--@0@'.format(m), '--@0@'.format(m),
], ],

11
src/compiler/glsl/tests/meson.build
View File

@@ -84,8 +84,10 @@ test(
) )
test( test(
'glsl compiler warnings', find_program('warnings_test.py'), 'glsl compiler warnings',
prog_python,
args : [ args : [
join_paths(meson.current_source_dir(), 'warnings_test.py'),
'--glsl-compiler', glsl_compiler, '--glsl-compiler', glsl_compiler,
'--test-directory', join_paths( '--test-directory', join_paths(
meson.source_root(), 'src', 'compiler', 'glsl', 'tests', 'warnings' meson.source_root(), 'src', 'compiler', 'glsl', 'tests', 'warnings'
@@ -94,6 +96,9 @@ test(
) )
test( test(
'glsl optimization', 'glsl optimization',
find_program('optimization_test.py'), prog_python,
args : ['--test-runner', glsl_test], args : [
join_paths(meson.current_source_dir(), 'optimization_test.py'),
'--test-runner', glsl_test
],
) )