meson: Use consistent style for tests

Don't use intermediate variables, use consistent whitespace.

Acked-by: Eric Engestrom <[email protected]>
Signed-off-by: Dylan Baker <[email protected]>

3 files changed, 33 insertions, 26 deletions

diff --git a/src/intel/compiler/meson.build b/src/intel/compiler/meson.build
index c54c117223c..19e5926a0d9 100644
--- a/src/intel/compiler/meson.build
+++ b/src/intel/compiler/meson.build
@@ -145,14 +145,17 @@ if with_tests
                'fs_saturate_propagation', 'vf_float_conversions',
                'vec4_register_coalesce', 'vec4_copy_propagation',
                'vec4_cmod_propagation', 'eu_compact', 'eu_validate']
-    _exe = executable(
-      [t, nir_opcodes_h, ir_expression_operation_h],
-      'test_@[email protected]'.format(t),
-      include_directories : [inc_common, inc_intel],
-      link_with : [libintel_compiler, libintel_common, libnir, libmesa_util,
-                   libisl],
-      dependencies : [dep_thread, dep_dl, idep_gtest],
+    test(
+      t,
+      executable(
+        [t, nir_opcodes_h, ir_expression_operation_h],
+        'test_@[email protected]'.format(t),
+        include_directories : [inc_common, inc_intel],
+        link_with : [
+          libintel_compiler, libintel_common, libnir, libmesa_util, libisl,
+        ],
+        dependencies : [dep_thread, dep_dl, idep_gtest],
+      )
     )
-    test(t, _exe)
   endforeach
 endif
diff --git a/src/intel/isl/meson.build b/src/intel/isl/meson.build
index 47fd8d97c32..116750d86d6 100644
--- a/src/intel/isl/meson.build
+++ b/src/intel/isl/meson.build
@@ -90,13 +90,14 @@ libisl = static_library(
 )
 
 if with_tests
-  isl_surf_get_image_offset_test = executable(
-    'isl_surf_get_image_offset_test',
-    'tests/isl_surf_get_image_offset_test.c',
-    dependencies : dep_m,
-    include_directories : [inc_common, inc_intel],
-    link_with : [libisl, libintel_common],
+  test(
+    'isl_surf_get_image_offset',
+    executable(
+      'isl_surf_get_image_offset_test',
+      'tests/isl_surf_get_image_offset_test.c',
+      dependencies : dep_m,
+      include_directories : [inc_common, inc_intel],
+      link_with : [libisl, libintel_common],
+    )
   )
-
-  test('isl_surf_get_image_offset', isl_surf_get_image_offset_test)
 endif
diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
index b219201944b..66266a0e95a 100644
--- a/src/intel/vulkan/meson.build
+++ b/src/intel/vulkan/meson.build
@@ -193,25 +193,28 @@ if with_tests
     link_whole : libanv_common,
     link_with : [
       libanv_gen_libs, libintel_compiler, libintel_common, libisl, libblorp,
-      libvulkan_util, libvulkan_wsi, libnir, libmesa_util,
+      libvulkan_util, libvulkan_wsi, libmesa_util,
     ],
     dependencies : [
       dep_libdrm, dep_thread, dep_dl, dep_m, anv_deps, dep_valgrind,
+      idep_nir,
     ],
     c_args : [c_vis_args, no_override_init_args, '-msse2', anv_flags],
   )
 
   foreach t : ['block_pool_no_free', 'state_pool_no_free',
                'state_pool_free_list_only', 'state_pool']
-    _exe = executable(
-      t,
-      ['tests/@[email protected]'.format(t), dummy_cpp, block_entrypoints],
-      link_with : libvulkan_intel_test,
-      dependencies : [dep_libdrm, dep_thread, dep_m, dep_valgrind],
-      include_directories : [
-        inc_common, inc_intel, inc_compiler, inc_vulkan_util, inc_vulkan_wsi,
-      ],
+    test(
+      'anv_@0@'.format(t),
+      executable(
+        t,
+        ['tests/@[email protected]'.format(t), dummy_cpp, block_entrypoints],
+        link_with : libvulkan_intel_test,
+        dependencies : [dep_libdrm, dep_thread, dep_m, dep_valgrind],
+        include_directories : [
+          inc_common, inc_intel, inc_compiler, inc_vulkan_util, inc_vulkan_wsi,
+        ],
+      )
     )
-    test('anv_@0@'.format(t), _exe)
   endforeach
 endif