glx: Hook up the unit tests again using the internal gtest.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

diff --git a/configure.ac b/configure.ac
index 9baccab3624b769a27b663d8e6cc49253cfb7501..65d358e0a8d6b9a6c5c2c77ca5721b958d2e596d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -82,18 +82,6 @@ solaris*)
     ;;
 esac
 
-AC_PATH_PROG([GTESTCONFIG], [gtest-config])
-if test "x$GTESTCONFIG" != "x"; then
-    GTEST_CFLAGS=`gtest-config --cppflags --cxxflags`
-    GTEST_LIBS=`gtest-config --ldflags --libs`
-    AC_SUBST([GTEST_CFLAGS])
-    AC_SUBST([GTEST_LIBS])
-    HAVE_GTEST=yes
-else
-    HAVE_GTEST=no
-fi
-AM_CONDITIONAL(HAVE_GTEST, test x$HAVE_GTEST = xyes)
-
 dnl clang is mostly GCC-compatible, but its version is much lower,
 dnl so we have to check for it.
 AC_MSG_CHECKING([if compiling with clang])
@@ -794,7 +782,7 @@ dnl
 dnl this variable will be prepended to SRC_DIRS and is not exported
 CORE_DIRS=""
 
-SRC_DIRS=""
+SRC_DIRS="gtest"
 GLU_DIRS="sgi"
 GALLIUM_DIRS="auxiliary drivers state_trackers"
 GALLIUM_TARGET_DIRS=""

diff --git a/src/glx/.gitignore b/src/glx/.gitignore
index f3c7a7c5da68804a1bdf391127ba34aed33c3cca..010d3f2064834d3bc318944845f825534b47a070 100644 (file)
--- a/src/glx/.gitignore
+++ b/src/glx/.gitignore
@@ -1 +1,4 @@
 Makefile
+Makefile.in
+libGL.la
+libglx.la

diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
index ec62faade99bb94f241b6bed82afe8fea6d8ed45..30fbd63751a6ddbdb8ebfb95c2dbcbdef57e94d8 100644 (file)
--- a/src/glx/Makefile.am
+++ b/src/glx/Makefile.am
@@ -55,7 +55,9 @@ lib_LTLIBRARIES = \
        $(NORMAL_GL_LIB) \
        $(MANGLED_GL_LIB)
 
-GL_FILES = \
+noinst_LTLIBRARIES = libglx.la
+
+libglx_la_SOURCES = \
          clientattrib.c \
          clientinfo.c \
          compsize.c \
@@ -96,6 +98,7 @@ GL_FILES = \
          applegl_glx.c
 
 GL_LIBS = \
+       libglx.la \
        $(SHARED_GLAPI_LIBS) \
        $(GLAPI_LIB) \
        $(GL_LIB_DEPS)
@@ -104,8 +107,8 @@ GL_LDFLAGS = \
        -Wl,-Bsymbolic \
        -version-number 1:2 -no-undefined
 
-libGL_la_SOURCES = $(GL_FILES)
-libMangledGL_la_SOURCES = $(GL_FILES)
+libGL_la_SOURCES =
+libMangledGL_la_SOURCES =
 libGL_la_LIBADD = $(GL_LIBS)
 libMangledGL_la_LIBADD = $(GL_LIBS)
 libGL_la_LDFLAGS = $(GL_LDFLAGS)

diff --git a/tests/glx/Makefile.am b/tests/glx/Makefile.am
index cdebf5d0cb15036f47376b59ddc7c6fca338cebc..b5cc0b001ab9ec924d7ef54902f37299e5bfe03d 100644 (file)
--- a/tests/glx/Makefile.am
+++ b/tests/glx/Makefile.am
@@ -3,7 +3,6 @@ AM_CFLAGS = -I$(top_builddir)/src/glx -I$(top_builddir)/src/mapi \
 AM_CXXFLAGS = -I$(top_builddir)/src/glx -I$(top_builddir)/src/mapi \
        $(X11_CFLAGS) $(GTEST_CFLAGS)
 
-if HAVE_GTEST
 if HAVE_XCB_GLX_CREATE_CONTEXT
 TESTS = glx_unittest
 check_PROGRAMS = glx_unittest
@@ -13,6 +12,9 @@ glx_unittest_SOURCES =                        \
         create_context_unittest.cpp    \
         fake_glx_screen.cpp
 
-glx_unittest_LDADD = $(top_builddir)/src/glx/libglx.a $(GTEST_LIBS) -lgtest_main
-endif
+glx_unittest_LDADD = \
+       $(top_builddir)/src/glx/libglx.la \
+       $(top_builddir)/src/gtest/libgtest.la \
+       -lpthread
+
 endif