From f5d3d1e7edb933efbf5c98b6b8716920c5877e08 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Thu, 23 Feb 2023 10:49:37 +0000 Subject: [PATCH] meson: inline gtest_test_protocol now that it's always 'gtest' Part-of: --- meson.build | 8 -------- src/asahi/compiler/meson.build | 2 +- src/asahi/layout/meson.build | 2 +- src/asahi/lib/meson.build | 2 +- src/compiler/glsl/tests/meson.build | 6 +++--- src/compiler/meson.build | 2 +- src/compiler/nir/meson.build | 4 ++-- src/gallium/auxiliary/meson.build | 2 +- src/gallium/drivers/etnaviv/meson.build | 2 +- src/gallium/drivers/virgl/tests/meson.build | 2 +- src/gallium/targets/libgl-gdi/meson.build | 2 +- src/gallium/targets/osmesa/meson.build | 2 +- src/glx/tests/meson.build | 2 +- src/intel/compiler/meson.build | 2 +- src/intel/isl/meson.build | 2 +- src/mapi/glapi/meson.build | 2 +- src/mapi/shared-glapi/meson.build | 2 +- src/mesa/main/tests/meson.build | 2 +- src/microsoft/clc/meson.build | 2 +- src/panfrost/compiler/meson.build | 2 +- src/panfrost/lib/meson.build | 2 +- src/panfrost/shared/meson.build | 2 +- src/util/meson.build | 4 ++-- 23 files changed, 26 insertions(+), 34 deletions(-) diff --git a/meson.build b/meson.build index 88ab5e3..20f919f 100644 --- a/meson.build +++ b/meson.build @@ -27,14 +27,6 @@ project( default_options : ['buildtype=debugoptimized', 'b_ndebug=if-release', 'c_std=c11', 'cpp_std=c++17', 'rust_std=2021'] ) -# In recent versions, meson can inject some extra arguments to get richer -# results from gtest based tests. Feature was added in 0.55, but requiring -# 0.59.2 to include an important fix. See https://github.com/mesonbuild/meson/pull/9283. -gtest_test_protocol = 'exitcode' -if meson.version().version_compare('>= 0.59.2') - gtest_test_protocol = 'gtest' -endif - cc = meson.get_compiler('c') cpp = meson.get_compiler('cpp') diff --git a/src/asahi/compiler/meson.build b/src/asahi/compiler/meson.build index 4a751e2..5664088 100644 --- a/src/asahi/compiler/meson.build +++ b/src/asahi/compiler/meson.build @@ -121,6 +121,6 @@ if with_tests link_with : [libasahi_compiler], ), suite : ['asahi'], - protocol : gtest_test_protocol, + protocol : 'gtest', ) endif diff --git a/src/asahi/layout/meson.build b/src/asahi/layout/meson.build index 8b4461b..b6a8c00 100644 --- a/src/asahi/layout/meson.build +++ b/src/asahi/layout/meson.build @@ -50,6 +50,6 @@ if with_tests link_with : [libasahi_layout], ), suite : ['asahi'], - protocol : gtest_test_protocol, + protocol : 'gtest', ) endif diff --git a/src/asahi/lib/meson.build b/src/asahi/lib/meson.build index 8ec57b6..c314aff 100644 --- a/src/asahi/lib/meson.build +++ b/src/asahi/lib/meson.build @@ -89,7 +89,7 @@ if with_tests link_with : [libasahi_lib], ), suite : ['asahi'], - protocol : gtest_test_protocol, + protocol : 'gtest', ) endif diff --git a/src/compiler/glsl/tests/meson.build b/src/compiler/glsl/tests/meson.build index 226ff37..1603ac0 100644 --- a/src/compiler/glsl/tests/meson.build +++ b/src/compiler/glsl/tests/meson.build @@ -32,7 +32,7 @@ test( dependencies : [dep_clock, dep_thread, idep_gtest, idep_mesautil], ), suite : ['compiler', 'glsl'], - protocol : gtest_test_protocol, + protocol : 'gtest', ) test( @@ -47,7 +47,7 @@ test( dependencies : [dep_thread, idep_gtest, idep_mesautil], ), suite : ['compiler', 'glsl'], - protocol : gtest_test_protocol, + protocol : 'gtest', ) test( @@ -62,7 +62,7 @@ test( dependencies : [dep_thread, idep_gtest], ), suite : ['compiler', 'glsl'], - protocol : gtest_test_protocol, + protocol : 'gtest', ) # Meson can't auto-skip these on cross builds because of the python wrapper diff --git a/src/compiler/meson.build b/src/compiler/meson.build index c14e230..edac9e8 100644 --- a/src/compiler/meson.build +++ b/src/compiler/meson.build @@ -88,7 +88,7 @@ if with_tests dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil], ), suite : ['compiler', 'spirv'], - protocol : gtest_test_protocol, + protocol : 'gtest', ) endif diff --git a/src/compiler/nir/meson.build b/src/compiler/nir/meson.build index 6ed71d4..1c82ea7 100644 --- a/src/compiler/nir/meson.build +++ b/src/compiler/nir/meson.build @@ -428,7 +428,7 @@ if with_tests dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil], ), suite : ['compiler', 'nir'], - protocol : gtest_test_protocol, + protocol : 'gtest', ) test( @@ -453,7 +453,7 @@ if with_tests suite : ['compiler', 'nir'], # TODO: Use a negative filter for gtest instead of the expect failure here. should_fail : meson.get_external_property('xfail', '').contains('load_store_vectorizer'), - protocol : gtest_test_protocol, + protocol : 'gtest', ) test( diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build index 5dc998d..3d7ec91 100644 --- a/src/gallium/auxiliary/meson.build +++ b/src/gallium/auxiliary/meson.build @@ -534,7 +534,7 @@ if with_tests dependencies : [idep_gtest], ), suite: 'gallium', - protocol : gtest_test_protocol, + protocol : 'gtest', ) endif diff --git a/src/gallium/drivers/etnaviv/meson.build b/src/gallium/drivers/etnaviv/meson.build index d6d43c1..26b1047 100644 --- a/src/gallium/drivers/etnaviv/meson.build +++ b/src/gallium/drivers/etnaviv/meson.build @@ -144,6 +144,6 @@ if with_tests dependencies : [idep_gtest, idep_nir], ), suite : ['compiler', 'etnaviv'], - protocol : gtest_test_protocol, + protocol : 'gtest', ) endif diff --git a/src/gallium/drivers/virgl/tests/meson.build b/src/gallium/drivers/virgl/tests/meson.build index a41fcc0..c7701aa 100644 --- a/src/gallium/drivers/virgl/tests/meson.build +++ b/src/gallium/drivers/virgl/tests/meson.build @@ -28,5 +28,5 @@ test( link_with : [libvirgl, libgallium], ), suite : ['virgl'], - protocol : gtest_test_protocol, + protocol : 'gtest', ) diff --git a/src/gallium/targets/libgl-gdi/meson.build b/src/gallium/targets/libgl-gdi/meson.build index b3dd3f4..3b310fc 100644 --- a/src/gallium/targets/libgl-gdi/meson.build +++ b/src/gallium/targets/libgl-gdi/meson.build @@ -78,6 +78,6 @@ if with_tests suite : ['wgl'], env : wgl_test_env, depends : [libopengl32], - protocol : gtest_test_protocol, + protocol : 'gtest', ) endif diff --git a/src/gallium/targets/osmesa/meson.build b/src/gallium/targets/osmesa/meson.build index a682301..d16e785 100644 --- a/src/gallium/targets/osmesa/meson.build +++ b/src/gallium/targets/osmesa/meson.build @@ -94,6 +94,6 @@ if with_tests dependencies : [idep_gtest], ), suite: 'gallium', - protocol : gtest_test_protocol, + protocol : 'gtest', ) endif diff --git a/src/glx/tests/meson.build b/src/glx/tests/meson.build index e068fe0..3f70646 100644 --- a/src/glx/tests/meson.build +++ b/src/glx/tests/meson.build @@ -50,6 +50,6 @@ if with_shared_glapi dependencies : [dep_libdrm, dep_glproto, dep_thread, idep_gtest] ), suite : ['glx'], - protocol : gtest_test_protocol, + protocol : 'gtest', ) endif diff --git a/src/intel/compiler/meson.build b/src/intel/compiler/meson.build index 04e7c91..c3010d6 100644 --- a/src/intel/compiler/meson.build +++ b/src/intel/compiler/meson.build @@ -210,6 +210,6 @@ if with_tests dependencies : [idep_gtest, idep_nir, idep_mesautil, idep_intel_dev], ), suite : ['intel'], - protocol : gtest_test_protocol, + protocol : 'gtest', ) endif diff --git a/src/intel/isl/meson.build b/src/intel/isl/meson.build index c9436b8..6b2213b 100644 --- a/src/intel/isl/meson.build +++ b/src/intel/isl/meson.build @@ -171,6 +171,6 @@ if with_tests cpp_args : '-DIN_UNIT_TEST', ), suite : ['intel'], - protocol : gtest_test_protocol, + protocol : 'gtest', ) endif diff --git a/src/mapi/glapi/meson.build b/src/mapi/glapi/meson.build index eab9882..516a2b0 100644 --- a/src/mapi/glapi/meson.build +++ b/src/mapi/glapi/meson.build @@ -111,6 +111,6 @@ if with_any_opengl and not with_shared_glapi and with_tests and not with_platfor dependencies : [idep_gtest, dep_thread], ), suite : ['mapi'], - protocol : gtest_test_protocol, + protocol : 'gtest', ) endif diff --git a/src/mapi/shared-glapi/meson.build b/src/mapi/shared-glapi/meson.build index ea27ce1..d23cb7d 100644 --- a/src/mapi/shared-glapi/meson.build +++ b/src/mapi/shared-glapi/meson.build @@ -74,7 +74,7 @@ if with_any_opengl and with_tests dependencies : [dep_thread, idep_gtest, idep_mesautilc11], ), suite : ['mapi'], - protocol : gtest_test_protocol, + protocol : 'gtest', ) if with_symbols_check test( diff --git a/src/mesa/main/tests/meson.build b/src/mesa/main/tests/meson.build index ac0daab..36615c2 100644 --- a/src/mesa/main/tests/meson.build +++ b/src/mesa/main/tests/meson.build @@ -47,5 +47,5 @@ test( link_with : [libmesa, libgallium, link_main_test], ), suite : ['mesa'], - protocol : gtest_test_protocol, + protocol : 'gtest', ) diff --git a/src/microsoft/clc/meson.build b/src/microsoft/clc/meson.build index 35e2fb38..8e6e77e 100644 --- a/src/microsoft/clc/meson.build +++ b/src/microsoft/clc/meson.build @@ -44,7 +44,7 @@ if dep_dxheaders.found() and host_machine.system() == 'windows' ) if build_machine.system() == 'windows' - test('clc_compiler_test', clc_compiler_test, timeout: 180, protocol : gtest_test_protocol) + test('clc_compiler_test', clc_compiler_test, timeout: 180, protocol : 'gtest') endif endif diff --git a/src/panfrost/compiler/meson.build b/src/panfrost/compiler/meson.build index ed620ff..367da2e 100644 --- a/src/panfrost/compiler/meson.build +++ b/src/panfrost/compiler/meson.build @@ -185,6 +185,6 @@ if with_tests link_with : [libpanfrost_bifrost], ), suite : ['panfrost'], - protocol : gtest_test_protocol, + protocol : 'gtest', ) endif diff --git a/src/panfrost/lib/meson.build b/src/panfrost/lib/meson.build index 3d702fc..139f34b 100644 --- a/src/panfrost/lib/meson.build +++ b/src/panfrost/lib/meson.build @@ -142,6 +142,6 @@ if with_tests dependencies: [idep_gtest, libpanfrost_dep], ), suite : ['panfrost'], - protocol : gtest_test_protocol, + protocol : 'gtest', ) endif diff --git a/src/panfrost/shared/meson.build b/src/panfrost/shared/meson.build index ce19749..d33161f 100644 --- a/src/panfrost/shared/meson.build +++ b/src/panfrost/shared/meson.build @@ -52,6 +52,6 @@ if with_tests link_with : [libpanfrost_shared], ), suite : ['panfrost'], - protocol : gtest_test_protocol, + protocol : 'gtest', ) endif diff --git a/src/util/meson.build b/src/util/meson.build index fe57c35..e74b187 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -329,7 +329,7 @@ if with_tests 'tests', 'drirc_home'), 'DRIRC_CONFIGDIR=' + join_paths(meson.current_source_dir(), 'tests', 'drirc_configdir')], - protocol : gtest_test_protocol, + protocol : 'gtest', ) endif @@ -381,7 +381,7 @@ if with_tests dependencies : [idep_mesautil, idep_gtest], ), suite : ['util'], - protocol : gtest_test_protocol, + protocol : 'gtest', timeout : 180, ) -- 2.7.4