diff options
| author | Mathieu Bridon <[email protected]> | 2018-08-17 21:32:18 +0200 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2018-08-22 08:41:01 -0700 |
| commit | e15686567c9481de86dc5088b41e480085d4fe0c (patch) | |
| tree | f86285a14d3f6261621c7389b3bdfdbbec166451 /src/compiler/glsl | |
| parent | ff0ce31e2a9135c3fcc3243773c442bc48f46b53 (diff) | |
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 <[email protected]>
Reviewed-by: Dylan Baker <[email protected]>
Reviewed-by: Mathieu Bridon <[email protected]>
Diffstat (limited to 'src/compiler/glsl')
| -rw-r--r-- | src/compiler/glsl/glcpp/meson.build | 3 | ||||
| -rw-r--r-- | src/compiler/glsl/tests/meson.build | 11 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/compiler/glsl/glcpp/meson.build b/src/compiler/glsl/glcpp/meson.build index 09d44ddd687..769406f5331 100644 --- a/src/compiler/glsl/glcpp/meson.build +++ b/src/compiler/glsl/glcpp/meson.build @@ -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), ], diff --git a/src/compiler/glsl/tests/meson.build b/src/compiler/glsl/tests/meson.build index fc7b863a278..2a41e30a28d 100644 --- a/src/compiler/glsl/tests/meson.build +++ b/src/compiler/glsl/tests/meson.build @@ -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 + ], ) |