On 30 January 2012 20:08, Matt Turner <[email protected]> wrote: > On Mon, Jan 30, 2012 at 10:28 PM, Paul Berry <[email protected]> > wrote: > > Commit 99476561 (automake: src/glsl and src/glsl/glcpp) changed the > > build system so that src/glsl/glsl_test is not built by default. This > > inadvertently broke "make check", since the tests in > > src/glsl/tests/lower_jumps (which are run by "make check") rely on > > glsl_test. > > > > This patch ensures that "make check" builds glsl_test before running > > any tests. > > --- > > Makefile | 1 + > > 1 files changed, 1 insertions(+), 0 deletions(-) > > > > diff --git a/Makefile b/Makefile > > index 1fa369a..e593e7f 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -22,6 +22,7 @@ doxygen: > > cd doxygen && $(MAKE) > > > > check: > > + cd src/glsl && $(MAKE) check > > This will run the glcpp test suite as well. If you don't want to do > that, you can just do > > cd src/glsl && $(MAKE) glsl_test > > Either way, > Reviewed-by: Matt Turner <[email protected]> >
Thanks, Matt. Pushed. 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. > > I'll fix this up in the next day or so so that src/glsl/Makefile.am > will run these tests directly. > > Thanks for finding this Paul. I knew about glsl_test, but I hadn't > seen how it was used. > > Matt >
_______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
