glx: Move tests from tests/glx to src/glx/tests

This matches the organization of other unit tests in Mesa.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>

Makefile.am

@@ -19,13 +19,14 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-SUBDIRS = src tests
+SUBDIRS = src
 
 doxygen:
 	cd doxygen && $(MAKE)
 
 check-local:
 	$(MAKE) -C src/glsl/tests check
+	$(MAKE) -C src/glx/tests check
 
 clean-local:
 	-@touch $(top_builddir)/configs/current
@@ -56,8 +57,6 @@ PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
 EXTRA_FILES = \
 	aclocal.m4					\
 	configure					\
-	tests/Makefile.in				\
-	tests/glx/Makefile.in				\
 	src/glsl/glsl_parser.cpp			\
 	src/glsl/glsl_parser.h				\
 	src/glsl/glsl_lexer.cpp				\

configure.ac

@@ -2166,6 +2166,7 @@ AC_CONFIG_FILES([configs/autoconf
 		src/egl/wayland/wayland-drm/Makefile
 		src/glsl/tests/Makefile
 		src/glx/Makefile
+		src/glx/tests/Makefile
 		src/mapi/shared-glapi/Makefile
 		src/gtest/Makefile
 		src/mesa/libdricore/Makefile
@@ -2177,9 +2178,7 @@ AC_CONFIG_FILES([configs/autoconf
 		src/mesa/drivers/dri/nouveau/Makefile
 		src/mesa/drivers/dri/r200/Makefile
 		src/mesa/drivers/dri/radeon/Makefile
-		src/mesa/drivers/dri/swrast/Makefile
-		tests/Makefile
-		tests/glx/Makefile])
+		src/mesa/drivers/dri/swrast/Makefile])
 
 dnl Replace the configs/current symlink
 AC_CONFIG_COMMANDS([configs],[

src/glx/Makefile.am

@@ -24,6 +24,8 @@ SHARED_GLAPI_CFLAGS = -DGLX_SHARED_GLAPI
 SHARED_GLAPI_LIBS = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
 endif
 
+SUBDIRS=tests
+
 GLAPI_LIB = ../mapi/glapi/libglapi.a
 
 if HAVE_XF86VIDMODE

tests/.gitignore

@@ -1 +0,0 @@
-Makefile

tests/Makefile.am

@@ -1 +0,0 @@
-SUBDIRS=glx