From 6348181ac01f6b1c21d16873ea37f99a761e4e39 Mon Sep 17 00:00:00 2001 From: Seif Lotfy Date: Tue, 18 Jun 2013 17:21:42 +0200 Subject: [PATCH] Partially revert commit c5ada29a75e9c5a1 for the telepathy tests Fixes #686715 Signed-off-by: Seif Lotfy --- tests/telepathy/Makefile.am | 6 ++++++ tests/telepathy/init.vala | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/telepathy/Makefile.am b/tests/telepathy/Makefile.am index a2378e2..f3339e4 100644 --- a/tests/telepathy/Makefile.am +++ b/tests/telepathy/Makefile.am @@ -71,6 +71,7 @@ TESTS = \ persona-store-capabilities \ individual-retrieval \ individual-properties \ + init \ $(NULL) noinst_PROGRAMS = \ @@ -95,6 +96,10 @@ individual_zeitgeist_SOURCES = \ individual-zeitgeist.vala \ $(NULL) +init_SOURCES = \ + init.vala \ + $(NULL) + persona_store_capabilities_SOURCES = \ persona-store-capabilities.vala \ $(NULL) @@ -104,6 +109,7 @@ BUILT_SOURCES = \ individual_properties_vala.stamp \ individual_retrieval_vala.stamp \ individual_zeitgeist_vala.stamp \ + init_vala.stamp \ persona_store_capabilities_vala.stamp \ $(NULL) diff --git a/tests/telepathy/init.vala b/tests/telepathy/init.vala index 92cb1ff..f842a07 100644 --- a/tests/telepathy/init.vala +++ b/tests/telepathy/init.vala @@ -61,7 +61,7 @@ public class InitTests : TpfTest.TestCase }); /* Add a timeout for failure. */ - TestUtils.loop_run_with_non_fatal_timeout (this._main_loop, 5); + TestUtils.loop_run_with_non_fatal_timeout (main_loop, 5); /* Check results. */ assert (aggregator.is_quiescent == true); -- 2.7.4