Commit 2e8c866f authored by Ian Romanick's avatar Ian Romanick

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

This matches the organization of other unit tests in Mesa.
Signed-off-by: default avatarIan Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul's avatarBrian Paul <brianp@vmware.com>
parent f68ab039
......@@ -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 \
......
......@@ -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],[
......
......@@ -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
......
......@@ -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 \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment