summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--configure.ac1
-rw-r--r--src/glsl/tests/.gitignore1
-rw-r--r--src/glsl/tests/Makefile.am2
4 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 1368b44ea02..0f88071aaa5 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 7e4991f4f17..1b571b95c90 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 00000000000..f3c7a7c5da6
--- /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 00000000000..bfd97b3b831
--- /dev/null
+++ b/src/glsl/tests/Makefile.am
@@ -0,0 +1,2 @@
+TESTS = \
+ optimization-test