From f2298244150295340ce53a35ea6ff92433105f2c Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 27 Apr 2012 09:47:59 -0500
Subject: Switch to using the xorg-gtest main so that we're running under a
 dummy Xserver

---
 tests/Makefile.am | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 628056b..5eca08a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,10 @@
 
-AM_CPPFLAGS = $(GTEST_CPPFLAGS) $(INDICATOR_CFLAGS) -I${top_srcdir}/src -Wall -Werror
+AM_CPPFLAGS = \
+	$(GTEST_CPPFLAGS) \
+	$(XORG_GTEST_CPPFLAGS) \
+	$(INDICATOR_CFLAGS) \
+	-I${top_srcdir}/src \
+	-Wall -Werror
 AM_CXXFLAGS = $(GTEST_CXXFLAGS)
 
 TESTS = test-service
@@ -13,6 +18,7 @@ test_service_CPPFLAGS = \
 
 check_LIBRARIES = libgtest.a
 nodist_libgtest_a_SOURCES = \
+	$(XORG_GTEST_SOURCE)/src/xorg-gtest-all.cpp \
 	$(GTEST_SOURCE)/src/gtest-all.cc \
-	$(GTEST_SOURCE)/src/gtest_main.cc
+	$(XORG_GTEST_SOURCE)/src/xorg-gtest_main.cpp
 
-- 
cgit v1.2.3