Module: Mesa
Branch: master
Commit: 54abd2e0844edf005510cb50b001cde8cf0366b7
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=54abd2e0844edf005510cb50b001cde8cf0366b7

Author: Eric Anholt <[email protected]>
Date:   Thu Jan 24 09:36:56 2019 -0800

gallium: Enable unit tests as actual meson unit tests.

These tests don't need swrast, so we can always enable them when
build_tests is set.  Most of them run to successful completion quickly
(.9s on my SKL).

Reviewed-by: <Roland Scheidegger [email protected]>

---

 src/gallium/tests/meson.build      |  4 +---
 src/gallium/tests/unit/meson.build | 12 ++++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/gallium/tests/meson.build b/src/gallium/tests/meson.build
index 0ee04350c8..080bd8485b 100644
--- a/src/gallium/tests/meson.build
+++ b/src/gallium/tests/meson.build
@@ -19,7 +19,5 @@
 # SOFTWARE.
 
 subdir('trivial')
-if with_gallium_softpipe
-  subdir('unit')
-endif
+subdir('unit')
 subdir('graw')
diff --git a/src/gallium/tests/unit/meson.build 
b/src/gallium/tests/unit/meson.build
index 4a97810dfa..eacbd39b88 100644
--- a/src/gallium/tests/unit/meson.build
+++ b/src/gallium/tests/unit/meson.build
@@ -20,12 +20,16 @@
 
 foreach t : ['pipe_barrier_test', 'u_cache_test', 'u_half_test',
              'u_format_test', 'u_format_compatible_test', 'translate_test']
-  executable(
+  exe = executable(
     t,
     '@[email protected]'.format(t),
-    include_directories : [inc_common, inc_gallium_drivers, 
inc_gallium_winsys],
-    link_with : [libgallium, libmesa_util, libws_null],
-    dependencies : [driver_swrast, dep_thread],
+    include_directories : inc_common,
+    link_with : [libgallium, libmesa_util],
+    dependencies : [dep_thread],
     install : false,
   )
+  # u_cache_test is slow, and translate_test fails.
+  if not ['u_cache_test', 'translate_test'].contains(t)
+    test(t, exe, suite: 'gallium')
+  endif
 endforeach

_______________________________________________
mesa-commit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to