diff options
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/gallium/meson.build | 6 | ||||
| -rw-r--r-- | src/gallium/tests/meson.build | 21 | ||||
| -rw-r--r-- | src/gallium/tests/trivial/meson.build | 29 |
4 files changed, 54 insertions, 4 deletions
diff --git a/meson.build b/meson.build index a4dfa62255..9dc6843940 100644 --- a/meson.build +++ b/meson.build @@ -1305,8 +1305,6 @@ else dep_lmsensors = null_dep endif -# TODO: gallium tests - # TODO: various libdirs # TODO: gallium driver dirs diff --git a/src/gallium/meson.build b/src/gallium/meson.build index c4dd8e1c26..4468b1906a 100644 --- a/src/gallium/meson.build +++ b/src/gallium/meson.build @@ -1,5 +1,5 @@ # Copyright © 2017 Dylan Baker -# Copyright © 2017 Intel Corporation +# Copyright © 2017-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 @@ -191,4 +191,6 @@ if with_gallium_st_nine subdir('state_trackers/nine') subdir('targets/d3dadapter9') endif -# TODO: tests +if with_tests + subdir('tests') +endif diff --git a/src/gallium/tests/meson.build b/src/gallium/tests/meson.build new file mode 100644 index 0000000000..1779874fb1 --- /dev/null +++ b/src/gallium/tests/meson.build @@ -0,0 +1,21 @@ +# 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. + +subdir('trivial') diff --git a/src/gallium/tests/trivial/meson.build b/src/gallium/tests/trivial/meson.build new file mode 100644 index 0000000000..bbb25519e1 --- /dev/null +++ b/src/gallium/tests/trivial/meson.build @@ -0,0 +1,29 @@ +# 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. + +foreach t : ['compute', 'tri', 'quad-tex'] + executable( + t, + '@0@.c'.format(t), + include_directories : inc_common, + link_with : [libmesa_util, libgallium, libpipe_loader_dynamic], + install : false, + ) +endforeach |