diff options
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/glx/Makefile.am | 2 | ||||
| -rw-r--r-- | src/glx/tests/.gitignore (renamed from tests/glx/.gitignore) | 0 | ||||
| -rw-r--r-- | src/glx/tests/Makefile.am (renamed from tests/glx/Makefile.am) | 4 | ||||
| -rw-r--r-- | src/glx/tests/clientinfo_unittest.cpp (renamed from tests/glx/clientinfo_unittest.cpp) | 0 | ||||
| -rw-r--r-- | src/glx/tests/create_context_unittest.cpp (renamed from tests/glx/create_context_unittest.cpp) | 0 | ||||
| -rw-r--r-- | src/glx/tests/fake_glx_screen.cpp (renamed from tests/glx/fake_glx_screen.cpp) | 0 | ||||
| -rw-r--r-- | src/glx/tests/fake_glx_screen.h (renamed from tests/glx/fake_glx_screen.h) | 0 | ||||
| -rw-r--r-- | src/glx/tests/mock_xdisplay.h (renamed from tests/glx/mock_xdisplay.h) | 0 | ||||
| -rw-r--r-- | tests/.gitignore | 1 | ||||
| -rw-r--r-- | tests/Makefile.am | 1 |
12 files changed, 8 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 59fd9b58493..008ac712902 100644 --- 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 29ee87bb004..867d6f60765 100644 --- 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 30fbd63751a..37a938d14ea 100644 --- 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 index dab7e97277e..dab7e97277e 100644 --- a/tests/glx/.gitignore +++ b/src/glx/tests/.gitignore diff --git a/tests/glx/Makefile.am b/src/glx/tests/Makefile.am index 7413d3b7eea..e7e2697cb9d 100644 --- 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 index f599c833a66..f599c833a66 100644 --- a/tests/glx/clientinfo_unittest.cpp +++ b/src/glx/tests/clientinfo_unittest.cpp diff --git a/tests/glx/create_context_unittest.cpp b/src/glx/tests/create_context_unittest.cpp index f97ec7ca5f2..f97ec7ca5f2 100644 --- a/tests/glx/create_context_unittest.cpp +++ b/src/glx/tests/create_context_unittest.cpp diff --git a/tests/glx/fake_glx_screen.cpp b/src/glx/tests/fake_glx_screen.cpp index 12d003b84f7..12d003b84f7 100644 --- a/tests/glx/fake_glx_screen.cpp +++ b/src/glx/tests/fake_glx_screen.cpp diff --git a/tests/glx/fake_glx_screen.h b/src/glx/tests/fake_glx_screen.h index 21515225971..21515225971 100644 --- a/tests/glx/fake_glx_screen.h +++ b/src/glx/tests/fake_glx_screen.h diff --git a/tests/glx/mock_xdisplay.h b/src/glx/tests/mock_xdisplay.h index 736a2784050..736a2784050 100644 --- a/tests/glx/mock_xdisplay.h +++ b/src/glx/tests/mock_xdisplay.h diff --git a/tests/.gitignore b/tests/.gitignore deleted file mode 100644 index f3c7a7c5da6..00000000000 --- a/tests/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/tests/Makefile.am b/tests/Makefile.am deleted file mode 100644 index 4079bb9da9a..00000000000 --- a/tests/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS=glx |