From 705eb1b42bd83149592a284a035b54c3346936da Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 26 Apr 2012 14:34:38 -0500
Subject: add scaffolding for indicator-session-service Google Testing with
 libdbustest

---
 tests/Makefile.am | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 tests/Makefile.am

(limited to 'tests/Makefile.am')

diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 0000000..85df398
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,19 @@
+AM_CPPFLAGS = $(GTEST_CPPFLAGS) $(SESSIONSERVICE_CFLAGS) $(LIBDBUSTEST_CFLAGS) -I${top_srcdir}/src -Wall -Werror
+AM_CXXFLAGS = $(GTEST_CXXFLAGS)
+
+check_PROGRAMS = test-service
+test_service_SOURCES = test-service.cc
+test_service_LDADD = $(SESSIONSERVICE_LIBS) $(LIBDBUSTEST_LIBS) libgtest.a
+
+check_LIBRARIES = libgtest.a
+nodist_libgtest_a_SOURCES = \
+	$(GTEST_SOURCE)/src/gtest-all.cc \
+	$(GTEST_SOURCE)/src/gtest_main.cc
+
+check_SCRIPTS = test-service-runner.sh
+test-service-runner.sh: Makefile.am
+	@echo "#!/bin/sh" > $@
+	@echo $(top_builddir)/tests/test-service $(top_builddir)/src/indicator-session-service$(EXEEXT) 2\>/dev/null >> $@
+	@chmod +x $@
+
+TESTS = ${check_SCRIPTS}
-- 
cgit v1.2.3


From 1bab86efd3e4637d61e20364c2859982605850b1 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 26 Apr 2012 16:37:10 -0500
Subject: sync with the other indicatorsGTest automake rules

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

(limited to 'tests/Makefile.am')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 85df398..c03af4c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,9 +1,10 @@
-AM_CPPFLAGS = $(GTEST_CPPFLAGS) $(SESSIONSERVICE_CFLAGS) $(LIBDBUSTEST_CFLAGS) -I${top_srcdir}/src -Wall -Werror
+AM_CPPFLAGS = $(GTEST_CPPFLAGS) $(INDICATOR_CFLAGS) -I${top_srcdir}/src -Wall -Werror
 AM_CXXFLAGS = $(GTEST_CXXFLAGS)
 
 check_PROGRAMS = test-service
 test_service_SOURCES = test-service.cc
-test_service_LDADD = $(SESSIONSERVICE_LIBS) $(LIBDBUSTEST_LIBS) libgtest.a
+test_service_LDADD = $(TEST_SERVICE_LIBS) libgtest.a
+test_service_CPPFLAGS = $(TEST_SERVICE_CFLAGS) $(AM_CPPFLAGS)
 
 check_LIBRARIES = libgtest.a
 nodist_libgtest_a_SOURCES = \
-- 
cgit v1.2.3


From 123a7fec04d313d4d420249ab24a38eb587c3ef7 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 27 Apr 2012 09:43:45 -0500
Subject: Change the service path to be a define instead of passed on the
 command line

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

(limited to 'tests/Makefile.am')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index c03af4c..628056b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,20 +1,18 @@
+
 AM_CPPFLAGS = $(GTEST_CPPFLAGS) $(INDICATOR_CFLAGS) -I${top_srcdir}/src -Wall -Werror
 AM_CXXFLAGS = $(GTEST_CXXFLAGS)
 
+TESTS = test-service
 check_PROGRAMS = test-service
 test_service_SOURCES = test-service.cc
 test_service_LDADD = $(TEST_SERVICE_LIBS) libgtest.a
-test_service_CPPFLAGS = $(TEST_SERVICE_CFLAGS) $(AM_CPPFLAGS)
+test_service_CPPFLAGS = \
+	$(TEST_SERVICE_CFLAGS) \
+	$(AM_CPPFLAGS) \
+	-DINDICATOR_SERVICE_PATH="\"$(top_builddir)/src/indicator-session-service\""
 
 check_LIBRARIES = libgtest.a
 nodist_libgtest_a_SOURCES = \
 	$(GTEST_SOURCE)/src/gtest-all.cc \
 	$(GTEST_SOURCE)/src/gtest_main.cc
 
-check_SCRIPTS = test-service-runner.sh
-test-service-runner.sh: Makefile.am
-	@echo "#!/bin/sh" > $@
-	@echo $(top_builddir)/tests/test-service $(top_builddir)/src/indicator-session-service$(EXEEXT) 2\>/dev/null >> $@
-	@chmod +x $@
-
-TESTS = ${check_SCRIPTS}
-- 
cgit v1.2.3


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/Makefile.am')

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