On 30 January 2012 20:08, Matt Turner <span dir="ltr"><<a href="mailto:mattst88@gmail.com">mattst88@gmail.com</a>></span> wrote:<br><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div class="im">On Mon, Jan 30, 2012 at 10:28 PM, Paul Berry <<a href="mailto:stereotype441@gmail.com">stereotype441@gmail.com</a>> wrote:<br>
> Commit 99476561 (automake: src/glsl and src/glsl/glcpp) changed the<br>
> build system so that src/glsl/glsl_test is not built by default. This<br>
> inadvertently broke "make check", since the tests in<br>
> src/glsl/tests/lower_jumps (which are run by "make check") rely on<br>
> glsl_test.<br>
><br>
> This patch ensures that "make check" builds glsl_test before running<br>
> any tests.<br>
> ---<br>
> Makefile | 1 +<br>
> 1 files changed, 1 insertions(+), 0 deletions(-)<br>
><br>
> diff --git a/Makefile b/Makefile<br>
> index 1fa369a..e593e7f 100644<br>
> --- a/Makefile<br>
> +++ b/Makefile<br>
> @@ -22,6 +22,7 @@ doxygen:<br>
> cd doxygen && $(MAKE)<br>
><br>
> check:<br>
> + cd src/glsl && $(MAKE) check<br>
<br>
</div>This will run the glcpp test suite as well. If you don't want to do<br>
that, you can just do<br>
<br>
cd src/glsl && $(MAKE) glsl_test<br>
<br>
Either way,<br>
Reviewed-by: Matt Turner <<a href="mailto:mattst88@gmail.com">mattst88@gmail.com</a>><br></blockquote><div><br>Thanks, Matt. Pushed.<br><br>BTW, I left the patch as "cd src/glsl && $(MAKE) check", since I'd prefer to have "make check" run as many tests as possible.<br>
</div><blockquote class="gmail_quote" style="margin:0pt 0pt 0pt 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<br>
I'll fix this up in the next day or so so that src/glsl/Makefile.am<br>
will run these tests directly.<br>
<br>
Thanks for finding this Paul. I knew about glsl_test, but I hadn't<br>
seen how it was used.<br>
<span class="HOEnZb"><font color="#888888"><br>
Matt<br>
</font></span></blockquote></div><br>