diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2012-11-06 20:14:53 -0600 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2012-11-06 20:14:53 -0600 |
| commit | 0b63ef0ea8625d713b9f726c8d664fdbeb37481d (patch) | |
| tree | fbd3559a9a5d326c2257f3e695a36be340773787 /tests/Makefile.am | |
| parent | ccc363f909fc8e2ecc571e83e18c12f46b771c1c (diff) | |
| download | ayatana-indicator-session-0b63ef0ea8625d713b9f726c8d664fdbeb37481d.tar.gz ayatana-indicator-session-0b63ef0ea8625d713b9f726c8d664fdbeb37481d.tar.bz2 ayatana-indicator-session-0b63ef0ea8625d713b9f726c8d664fdbeb37481d.zip | |
Reimplement test-service s.t. we actually test activating the service via dbus. Drop unneeded Xorg baggage.
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 49 |
1 files changed, 30 insertions, 19 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 9371c2e..eedef3a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,31 +1,42 @@ TESTS = CLEANFILES = +BUILT_SOURCES = +check_PROGRAMS = + +### +### +### # stock UMB tests on user-visible strings include $(srcdir)/Makefile.am.strings -AM_CPPFLAGS = \ - $(GTEST_CPPFLAGS) \ - $(XORG_GTEST_CPPFLAGS) \ - $(INDICATOR_CFLAGS) \ - -I${top_srcdir}/src \ - -Wall -Werror +check_LIBRARIES = libgtest.a +nodist_libgtest_a_SOURCES = \ + $(GTEST_SOURCE)/src/gtest-all.cc \ + $(GTEST_SOURCE)/src/gtest_main.cc + +AM_CPPFLAGS = $(GTEST_CPPFLAGS) -I${top_srcdir}/src -Wall -Werror AM_CXXFLAGS = $(GTEST_CXXFLAGS) -TESTS = test-service -check_PROGRAMS = test-service -test_service_SOURCES = \ - test-service.cc \ - gtest-dbus-helper.h -test_service_LDADD = $(TEST_SERVICE_LIBS) libgtest.a $(XORG_GTEST_MAIN_LIBS) $(X11_LIBS) +BUILT_SOURCES += gschemas.compiled +CLEANFILES += gschemas.compiled +gschemas.compiled: Makefile + @glib-compile-schemas --targetdir=$(abs_builddir) $(top_builddir)/data + +### +### +### + +TESTS += test-service +check_PROGRAMS += test-service +test_service_SOURCES = test-service.cc +test_service_LDADD = \ + $(TEST_SERVICE_LIBS) \ + libgtest.a test_service_CPPFLAGS = \ + -DINDICATOR_SERVICE_DIR="\"$(abs_builddir)\"" \ + -DINDICATOR_SERVICE_PATH="\"$(top_builddir)/src/indicator-session-service\"" \ $(TEST_SERVICE_CFLAGS) \ - $(AM_CPPFLAGS) \ - -DINDICATOR_SERVICE_PATH="\"$(top_builddir)/src/indicator-session-service\"" + $(AM_CPPFLAGS) -check_LIBRARIES = libgtest.a -nodist_libgtest_a_SOURCES = \ - $(XORG_GTEST_SOURCE)/src/xorg-gtest-all.cpp \ - $(GTEST_SOURCE)/src/gtest-all.cc \ - $(XORG_GTEST_SOURCE)/src/xorg-gtest_main.cpp |