X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fcompiler%2Fglsl%2Ftests%2Fmeson.build;h=c887a5a7e4ca508ffa4a0f625ed14b27e362b30a;hb=95f555a93a8891ebba2a291eecd984eb2364d636;hp=040b2576721fe423187e2d87ffebb997961d1c0b;hpb=ad9c2f20181fdaa9f2b1e7222a861ebc876050b3;p=mesa.git

diff --git a/src/compiler/glsl/tests/meson.build b/src/compiler/glsl/tests/meson.build
index 040b2576721..c887a5a7e4c 100644
--- a/src/compiler/glsl/tests/meson.build
+++ b/src/compiler/glsl/tests/meson.build
@@ -18,29 +18,20 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-test(
-  'blob_test',
-  executable(
-    'blob_test',
-    'blob_test.c',
-    c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
-    include_directories : [inc_common, inc_compiler],
-    link_with : [libglsl],
-  )
-)
-
-test(
-  'cache_test',
-  executable(
+if with_shader_cache
+  test(
     'cache_test',
-    'cache_test.c',
-    c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
-    include_directories : [inc_common, inc_glsl],
-    link_with : [libglsl],
-    dependencies : [dep_clock, dep_thread],
+    executable(
+      'cache_test',
+      'cache_test.c',
+      c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glsl],
+      link_with : [libglsl],
+      dependencies : [dep_clock, dep_thread],
+    ),
+    suite : ['compiler', 'glsl'],
   )
-)
-
+endif
 
 test(
   'general_ir_test',
@@ -51,10 +42,11 @@ test(
      'lower_int64_test.cpp', 'opt_add_neg_to_sub_test.cpp',
      'varyings_test.cpp', ir_expression_operation_h],
     cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
-    include_directories : [inc_common, inc_glsl],
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glsl],
     link_with : [libglsl, libglsl_standalone, libglsl_util],
     dependencies : [dep_clock, dep_thread, idep_gtest],
-  )
+  ),
+  suite : ['compiler', 'glsl'],
 )
 
 test(
@@ -65,10 +57,11 @@ test(
      'uniform_initializer_utils.cpp', 'uniform_initializer_utils.h',
      ir_expression_operation_h],
     cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
-    include_directories : [inc_common, inc_glsl],
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glsl],
     link_with : [libglsl, libglsl_util],
     dependencies : [dep_thread, idep_gtest],
-  )
+  ),
+  suite : ['compiler', 'glsl'],
 )
 
 test(
@@ -77,18 +70,65 @@ test(
     'sampler_types_test',
     ['sampler_types_test.cpp', ir_expression_operation_h],
     cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
-    include_directories : [inc_common, inc_glsl],
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glsl],
     link_with : [libglsl, libglsl_util],
     dependencies : [dep_thread, idep_gtest],
-  )
+  ),
+  suite : ['compiler', 'glsl'],
+)
+
+test(
+  'list_iterators',
+  executable(
+    'list_iterators',
+    ['list_iterators.cpp'],
+    cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
+    include_directories : [inc_include, inc_src, inc_glsl],
+    link_with : [libglsl, libglsl_util],
+    dependencies : [dep_thread, idep_gtest],
+  ),
+  suite : ['compiler', 'glsl'],
 )
 
 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'
     ),
   ],
+  suite : ['compiler', 'glsl'],
+  timeout: 60,
+)
+
+test(
+  'glsl optimization',
+  prog_python,
+  args : [
+    join_paths(meson.current_source_dir(), 'optimization_test.py'),
+    '--test-runner', glsl_test
+  ],
+  suite : ['compiler', 'glsl'],
 )
+
+if with_tools.contains('glsl')
+  test(
+    'glsl dump-builder test',
+    glsl_compiler,
+    args : ['--version', '110', '--dump-builder',
+            join_paths(meson.current_source_dir(), 'standalone_dump-builder.frag'),
+           ],
+    suite : ['compiler', 'glsl'],
+  )
+  test(
+    'glsl lower-precision test',
+    prog_python,
+    args : [join_paths(meson.current_source_dir(), 'lower_precision_test.py'),
+            glsl_compiler
+           ],
+    suite : ['compiler', 'glsl'],
+  )
+endif