diff options
| author | Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> | 2013-01-22 18:52:19 +0000 |
|---|---|---|
| committer | Tarmac <Unknown> | 2013-01-22 18:52:19 +0000 |
| commit | 57f37cc482e6df5daaa93f550dab7620777d0784 (patch) | |
| tree | 712c3a531e31442dce6bbf58a69cfa5b7436f03d /tests | |
| parent | a840d1a37fe26d5f05fc330be60b282f72a828c6 (diff) | |
| parent | 584694bf02e4ab81fa3459464532baa3a37be9d2 (diff) | |
| download | ayatana-indicator-session-57f37cc482e6df5daaa93f550dab7620777d0784.tar.gz ayatana-indicator-session-57f37cc482e6df5daaa93f550dab7620777d0784.tar.bz2 ayatana-indicator-session-57f37cc482e6df5daaa93f550dab7620777d0784.zip | |
Misc fixes for build on raring:
- Drop deprecated calls to g_type_init().
- Update paths to gtest source files due to changes in xorg-gtest.
Approved by PS Jenkins bot, Didier Roche.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/test-service.cc | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index c117c95..579f502 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -15,8 +15,8 @@ include $(srcdir)/Makefile.am.strings check_LIBRARIES = libgtest.a nodist_libgtest_a_SOURCES = \ - $(GTEST_SOURCE)/src/gtest-all.cc \ - $(GTEST_SOURCE)/src/gtest_main.cc + $(GTEST_SOURCE)/gtest-all.cc \ + $(GTEST_SOURCE)/gtest_main.cc AM_CPPFLAGS = $(GTEST_CPPFLAGS) -I${top_srcdir}/src -Wall -Werror AM_CXXFLAGS = $(GTEST_CXXFLAGS) diff --git a/tests/test-service.cc b/tests/test-service.cc index 4d540d6..b1ca5bc 100644 --- a/tests/test-service.cc +++ b/tests/test-service.cc @@ -49,7 +49,6 @@ class ClientTest : public ::testing::Test static bool first_run = true; if (first_run) { - g_type_init(); g_setenv ("INDICATOR_SERVICE_SHUTDOWN_TIMEOUT", "1000", TRUE); g_unsetenv ("INDICATOR_ALLOW_NO_WATCHERS"); g_unsetenv ("INDICATOR_SERVICE_REPLACE_MODE"); |