Mesa (master): glsl: Convert the tests directory to automake.

Eric Anholt anholt at kemper.freedesktop.org
Thu Apr 19 16:40:04 PDT 2012


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

Author: Eric Anholt <eric at anholt.net>
Date:   Mon Apr 16 09:53:29 2012 -0700

glsl: Convert the tests directory to automake.

This runs optimization-test and produces the usual automake test
output, which may be interesting to automated build systems.

This doesn't convert the tests to be individually exposed to the
automake runner, because automake doesn't like wildcards (due to being
nonportable in make, not that we care).

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 Makefile                   |    2 +-
 configure.ac               |    1 +
 src/glsl/tests/.gitignore  |    1 +
 src/glsl/tests/Makefile.am |    2 ++
 4 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index 1368b44..0f88071 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ doxygen:
 	cd doxygen && $(MAKE)
 
 check:
-	cd src/glsl/tests/ && ./optimization-test
+	make -C src/glsl/tests check
 	make -C tests check
 
 clean:
diff --git a/configure.ac b/configure.ac
index 7e4991f..1b571b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2005,6 +2005,7 @@ AC_CONFIG_FILES([configs/autoconf
 		src/egl/wayland/wayland-egl/Makefile
 		src/egl/wayland/wayland-egl/wayland-egl.pc
 		src/egl/wayland/wayland-drm/Makefile
+		src/glsl/tests/Makefile
 		src/glx/Makefile
 		src/mapi/shared-glapi/Makefile
 		src/gtest/Makefile
diff --git a/src/glsl/tests/.gitignore b/src/glsl/tests/.gitignore
new file mode 100644
index 0000000..f3c7a7c
--- /dev/null
+++ b/src/glsl/tests/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/src/glsl/tests/Makefile.am b/src/glsl/tests/Makefile.am
new file mode 100644
index 0000000..bfd97b3
--- /dev/null
+++ b/src/glsl/tests/Makefile.am
@@ -0,0 +1,2 @@
+TESTS = \
+	optimization-test



More information about the mesa-commit mailing list