<div dir="ltr">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.<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Jan 3, 2018 at 9:28 AM, Dylan Baker <span dir="ltr"><<a href="mailto:dylan@pnwbakers.com" target="_blank">dylan@pnwbakers.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Fixes a race condition in the build which causes sporadic failures when<br>
-Dbuild-tests=true and a significant number of cores is present.<br>
<br>
Fixes: d1992255bb29 ("meson: Add build Intel "anv" vulkan driver")<br>
CC: Mark Janes <<a href="mailto:mark.a.janes@intel.com">mark.a.janes@intel.com</a>><br>
Signed-off-by: Dylan Baker <<a href="mailto:dylan.c.baker@intel.com">dylan.c.baker@intel.com</a>><br>
---<br>
src/compiler/nir/meson.build | 20 +++++++++++---------<br>
1 file changed, 11 insertions(+), 9 deletions(-)<br>
<br>
diff --git a/src/compiler/nir/meson.build b/src/compiler/nir/meson.build<br>
index 5dd21e6652f..7d2309078b1 100644<br>
--- a/src/compiler/nir/meson.build<br>
+++ b/src/compiler/nir/meson.build<br>
@@ -208,14 +208,16 @@ libnir = static_library(<br>
nir_algebraic_py = files('nir_algebraic.py')<br>
<br>
if with_tests<br>
- nir_control_flow_test = executable(<br>
- 'nir_control_flow_test',<br>
- [files('tests/control_flow_<wbr>tests.cpp'), nir_opcodes_h],<br>
- c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],<br>
- include_directories : [inc_common],<br>
- dependencies : [dep_thread, idep_gtest],<br>
- link_with : [libmesa_util, libnir],<br>
+ test(<br>
+ 'nir_control_flow',<br>
+ executable(<br>
+ 'nir_control_flow_test',<br>
+ [files('tests/control_flow_<wbr>tests.cpp'), nir_opcodes_h,<br>
+ nir_builder_opcodes_h],<br>
+ c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],<br>
+ include_directories : [inc_common],<br>
+ dependencies : [dep_thread, idep_gtest],<br>
+ link_with : [libmesa_util, libnir],<br>
+ )<br>
)<br>
-<br>
- test('nir_control_flow', nir_control_flow_test)<br>
endif<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.15.1<br>
<br>
______________________________<wbr>_________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/mesa-dev</a><br>
</font></span></blockquote></div><br></div>