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@whitecape.org>

diff --git a/Makefile b/Makefile
index 1368b44ea020a5d49c7e034aab40cd244745fb98..0f88071aaa5120137646780b757759d3bcb0869c 100644 (file)
--- 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 7e4991f4f17af5b95fe7e4628341bc8f4fd436e1..1b571b95c90e481648fa23cf2367d43ce22155b7 100644 (file)
--- 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 (file)
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 (file)
index 0000000..bfd97b3
--- /dev/null
+++ b/src/glsl/tests/Makefile.am
@@ -0,0 +1,2 @@
+TESTS = \
+       optimization-test