Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com>
Reviewed-by: Eric Anholt <e...@anholt.net>
---
meson.build | 2 +--
src/gallium/meson.build | 6 ++++--
src/gallium/tests/meson.build | 21 ++++++++++++++++++++-
src/gallium/tests/trivial/meson.build | 29 ++++++++++++++++++++++++++++-
4 files changed, 54 insertions(+), 4 deletions(-)
create mode 100644 src/gallium/tests/meson.build
create mode 100644 src/gallium/tests/trivial/meson.build
diff --git a/meson.build b/meson.build
index ee2b415..c98c4ae 100644
--- a/meson.build
+++ b/meson.build
@@ -1302,8 +1302,6 @@ else
dep_lmsensors = []
endif
-# TODO: gallium tests
-
# TODO: various libdirs
# TODO: gallium driver dirs
diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index c9bfc0b..828f6ab 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
@@ -196,4 +196,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 0000000..1779874
--- /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 0000000..bbb2551
--- /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
--
git-series 0.9.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
