diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2012-04-27 15:17:47 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2012-04-27 15:17:47 -0500 |
| commit | ea22a6005cd8c2c07447bb7303f542d4e00570ad (patch) | |
| tree | 3094cc3300bda1559998bc9b1dcda89d08d711af /tests/Makefile.am | |
| parent | 1bab86efd3e4637d61e20364c2859982605850b1 (diff) | |
| parent | f2298244150295340ce53a35ea6ff92433105f2c (diff) | |
| download | ayatana-indicator-session-ea22a6005cd8c2c07447bb7303f542d4e00570ad.tar.gz ayatana-indicator-session-ea22a6005cd8c2c07447bb7303f542d4e00570ad.tar.bz2 ayatana-indicator-session-ea22a6005cd8c2c07447bb7303f542d4e00570ad.zip | |
use ted's suggestions for using xorg-gtest and to remove the service-test-runner.sh script
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index c03af4c..0d30bba 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,20 +1,24 @@ -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 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_LDADD = $(TEST_SERVICE_LIBS) libgtest.a $(XORG_GTEST_MAIN_LIBS) $(X11_LIBS) +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 = \ + $(XORG_GTEST_SOURCE)/src/xorg-gtest-all.cpp \ $(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 $@ + $(XORG_GTEST_SOURCE)/src/xorg-gtest_main.cpp -TESTS = ${check_SCRIPTS} |