[Mesa-dev] [PATCH] meson: nir_control_flow_test needs to depend on nir_builder_opcodes_h

[Dylan Baker]

I have such a patch series :)

It just needs a little more testing and this resolves an intermittent build
failure in the CI.

Quoting Jason Ekstrand (2018-01-03 09:37:36)
> Is there any way we can just make a "nir_deps" helper list and put
> nir_builder_opcodes_h in it?  Requiring everything which depends on nir gather
> up a bunch of random generator dependencies seems a bit fragile.
> 
> On Wed, Jan 3, 2018 at 9:28 AM, Dylan Baker <dylan at pnwbakers.com> wrote:
> 
>     Fixes a race condition in the build which causes sporadic failures when
>     -Dbuild-tests=true and a significant number of cores is present.
> 
>     Fixes: d1992255bb29 ("meson: Add build Intel "anv" vulkan driver")
>     CC: Mark Janes <mark.a.janes at intel.com>
>     Signed-off-by: Dylan Baker <dylan.c.baker at intel.com>
>     ---
>      src/compiler/nir/meson.build | 20 +++++++++++---------
>      1 file changed, 11 insertions(+), 9 deletions(-)
> 
>     diff --git a/src/compiler/nir/meson.build b/src/compiler/nir/meson.build
>     index 5dd21e6652f..7d2309078b1 100644
>     --- a/src/compiler/nir/meson.build
>     +++ b/src/compiler/nir/meson.build
>     @@ -208,14 +208,16 @@ libnir = static_library(
>      nir_algebraic_py = files('nir_algebraic.py')
> 
>      if with_tests
>     -  nir_control_flow_test = executable(
>     -    'nir_control_flow_test',
>     -    [files('tests/control_flow_tests.cpp'), nir_opcodes_h],
>     -    c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
>     -    include_directories : [inc_common],
>     -    dependencies : [dep_thread, idep_gtest],
>     -    link_with : [libmesa_util, libnir],
>     +  test(
>     +    'nir_control_flow',
>     +    executable(
>     +      'nir_control_flow_test',
>     +      [files('tests/control_flow_tests.cpp'), nir_opcodes_h,
>     +       nir_builder_opcodes_h],
>     +      c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
>     +      include_directories : [inc_common],
>     +      dependencies : [dep_thread, idep_gtest],
>     +      link_with : [libmesa_util, libnir],
>     +    )
>        )
>     -
>     -  test('nir_control_flow', nir_control_flow_test)
>      endif
>     --
>     2.15.1
> 
>     _______________________________________________
>     mesa-dev mailing list
>     mesa-dev at lists.freedesktop.org
>     https://lists.freedesktop.org/mailman/listinfo/mesa-dev
> 
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20180103/e940b113/attachment.sig>