aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2012-04-27 09:47:59 -0500
committerTed Gould <ted@gould.cx>2012-04-27 09:47:59 -0500
commitf2298244150295340ce53a35ea6ff92433105f2c (patch)
tree40fb8db2434815f5a293a5b561f069be26d0fd12
parent123a7fec04d313d4d420249ab24a38eb587c3ef7 (diff)
downloadayatana-indicator-session-f2298244150295340ce53a35ea6ff92433105f2c.tar.gz
ayatana-indicator-session-f2298244150295340ce53a35ea6ff92433105f2c.tar.bz2
ayatana-indicator-session-f2298244150295340ce53a35ea6ff92433105f2c.zip
Switch to using the xorg-gtest main so that we're running under a dummy Xserver
-rw-r--r--configure.ac1
-rw-r--r--tests/Makefile.am10
2 files changed, 9 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index e90a05e..3bac232 100644
--- a/configure.ac
+++ b/configure.ac
@@ -183,6 +183,7 @@ AC_ARG_ENABLE([tests],
if test "x$enable_tests" != "xno"; then
m4_include([m4/gtest.m4])
CHECK_GTEST
+ CHECK_XORG_GTEST
if test "x$enable_tests" = "xauto"; then
enable_tests=${have_gtest}
elif test "x$enable_tests" = "xyes" && test "x$have_gtest" != "xyes"; then
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