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>

diff --git a/Makefile.am b/Makefile.am
index 59fd9b5..008ac71 100644 (file)
--- a/Makefile.am
+++ b/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                         \

diff --git a/configure.ac b/configure.ac
index 29ee87b..867d6f6 100644 (file)
--- a/configure.ac
+++ b/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],[

diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
index 30fbd63..37a938d 100644 (file)
--- a/src/glx/Makefile.am
+++ b/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

diff --git a/tests/glx/.gitignore b/src/glx/tests/.gitignore
similarity index 100%
rename from tests/glx/.gitignore
rename to src/glx/tests/.gitignore

diff --git a/tests/glx/Makefile.am b/src/glx/tests/Makefile.am
similarity index 86%
rename from tests/glx/Makefile.am
rename to src/glx/tests/Makefile.am
index 7413d3b..e7e2697 100644 (file)
--- a/tests/glx/Makefile.am
+++ b/src/glx/tests/Makefile.am
@@ -11,8 +11,8 @@ check_PROGRAMS = glx_unittest
 
 glx_unittest_SOURCES =                 \
        clientinfo_unittest.cpp         \
-        create_context_unittest.cpp    \
-        fake_glx_screen.cpp
+       create_context_unittest.cpp     \
+       fake_glx_screen.cpp
 
 glx_unittest_LDADD = \
        $(top_builddir)/src/glx/libglx.la \

diff --git a/tests/glx/clientinfo_unittest.cpp b/src/glx/tests/clientinfo_unittest.cpp
similarity index 100%
rename from tests/glx/clientinfo_unittest.cpp
rename to src/glx/tests/clientinfo_unittest.cpp

diff --git a/tests/glx/create_context_unittest.cpp b/src/glx/tests/create_context_unittest.cpp
similarity index 100%
rename from tests/glx/create_context_unittest.cpp
rename to src/glx/tests/create_context_unittest.cpp

diff --git a/tests/glx/fake_glx_screen.cpp b/src/glx/tests/fake_glx_screen.cpp
similarity index 100%
rename from tests/glx/fake_glx_screen.cpp
rename to src/glx/tests/fake_glx_screen.cpp

diff --git a/tests/glx/fake_glx_screen.h b/src/glx/tests/fake_glx_screen.h
similarity index 100%
rename from tests/glx/fake_glx_screen.h
rename to src/glx/tests/fake_glx_screen.h

diff --git a/tests/glx/mock_xdisplay.h b/src/glx/tests/mock_xdisplay.h
similarity index 100%
rename from tests/glx/mock_xdisplay.h
rename to src/glx/tests/mock_xdisplay.h

diff --git a/tests/.gitignore b/tests/.gitignore
deleted file mode 100644 (file)
index f3c7a7c..0000000
--- a/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile

diff --git a/tests/Makefile.am b/tests/Makefile.am
deleted file mode 100644 (file)
index 4079bb9..0000000
--- a/tests/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS=glx