From 34cb4d0ebc14663113705beae63dd52b9d1b2d87 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 6 Feb 2018 15:46:25 -0800 Subject: [PATCH] meson: build tests for gallium mesa state tracker v2: - Fix typo Signed-off-by: Dylan Baker Reviewed-by: Eric Anholt --- src/mesa/state_tracker/tests/meson.build | 40 ++++++++++++++++++++++++ src/meson.build | 3 ++ 2 files changed, 43 insertions(+) create mode 100644 src/mesa/state_tracker/tests/meson.build diff --git a/src/mesa/state_tracker/tests/meson.build b/src/mesa/state_tracker/tests/meson.build new file mode 100644 index 00000000000..f62039ef1e5 --- /dev/null +++ b/src/mesa/state_tracker/tests/meson.build @@ -0,0 +1,40 @@ +# Copyright © 2018 Intel Corporation + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +libmesa_st_test_common = static_library( + 'mesa_st_test_common', + ['st_tests_common.cpp', ir_expression_operation_h], + include_directories : inc_common, + dependencies : dep_thread, +) + +test( + 'st_renumerate_test', + executable( + 'st_renumerate_test', + ['test_glsl_to_tgsi_lifetime.cpp', ir_expression_operation_h], + include_directories : inc_common, + link_with : [ + libmesa_st_test_common, libmesa_gallium, libglapi, libgallium, + libmesa_util, + ], + dependencies : [idep_gtest, dep_thread, dep_llvm] + ) +) diff --git a/src/meson.build b/src/meson.build index 19005271d73..5d8d554d711 100644 --- a/src/meson.build +++ b/src/meson.build @@ -80,6 +80,9 @@ if with_egl endif if with_gallium subdir('gallium') + # This has to be here since it requires libgallium, and subdir cannot + # contain .. + subdir('mesa/state_tracker/tests') endif # This must be after at least mesa, glx, and gallium, since libgl will be -- 2.30.2