diff options
| author | Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> | 2013-01-23 18:04:43 +0000 |
|---|---|---|
| committer | Tarmac <Unknown> | 2013-01-23 18:04:43 +0000 |
| commit | e86587ca9fd6e537fc34c1e465e96d9ca2a1c1fd (patch) | |
| tree | f6bb4bf97eb1937e069063e152985c5802322d17 /tests | |
| parent | 61f80b55a78feae1549d4121c355410f8aac71d6 (diff) | |
| parent | 8e878ce271c308a42e218d0c1b73d7f128dab7cb (diff) | |
| download | ayatana-indicator-datetime-e86587ca9fd6e537fc34c1e465e96d9ca2a1c1fd.tar.gz ayatana-indicator-datetime-e86587ca9fd6e537fc34c1e465e96d9ca2a1c1fd.tar.bz2 ayatana-indicator-datetime-e86587ca9fd6e537fc34c1e465e96d9ca2a1c1fd.zip | |
Update paths for gtest source files.
Approved by Allan LeSage.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/test-indicator.cc | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index cc3b52a..f6387a0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -12,8 +12,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-indicator.cc b/tests/test-indicator.cc index 67a2780..2480c94 100644 --- a/tests/test-indicator.cc +++ b/tests/test-indicator.cc @@ -34,7 +34,6 @@ namespace if (G_UNLIKELY(!initialized)) { initialized = true; - g_type_init(); g_setenv ("GSETTINGS_SCHEMA_DIR", SCHEMA_DIR, TRUE); } } |