Mesa (master): glsl: Fix optimization tests after converting src/ glsl to automake.

Paul Berry stereotype441 at kemper.freedesktop.org
Tue Jan 31 18:16:21 UTC 2012


Module: Mesa
Branch: master
Commit: ffe376d5a74dee837dc1a421de29ae551087630f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ffe376d5a74dee837dc1a421de29ae551087630f

Author: Paul Berry <stereotype441 at gmail.com>
Date:   Mon Jan 30 18:53:09 2012 -0800

glsl: Fix optimization tests after converting src/glsl to automake.

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.

Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

 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
 	cd src/glsl/tests/ && ./optimization-test
 	make -C tests check
 




More information about the mesa-commit mailing list