From 160f9beda8d7afda0f53f1d695365858f10077e8 Mon Sep 17 00:00:00 2001 From: Eamonn Brady Date: Tue, 1 Apr 2014 14:39:38 +0100 Subject: [PATCH] Fixed build error --- OpenHome/Tests/TestTopology1.cpp | 7 +++++++ OpenHome/Topologym.cpp | 2 +- oncommit.test | 8 ++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/OpenHome/Tests/TestTopology1.cpp b/OpenHome/Tests/TestTopology1.cpp index 02c19d8..5ccadbf 100644 --- a/OpenHome/Tests/TestTopology1.cpp +++ b/OpenHome/Tests/TestTopology1.cpp @@ -163,6 +163,13 @@ void SuiteTopology1::ScheduleCallback(void* aObj) void TestTopology1(Environment& aEnv, const std::vector& aArgs) { +/* + if(aArgs.size()==0) + { + Log::Print("NO ARGUMENTS SUPPLIED!!!"); + ASSERTS(); + } +*/ TestScriptHttpReader reader(aEnv, aArgs); Runner runner("Topology1 tests\n"); diff --git a/OpenHome/Topologym.cpp b/OpenHome/Topologym.cpp index 9b54f3b..f309076 100644 --- a/OpenHome/Topologym.cpp +++ b/OpenHome/Topologym.cpp @@ -364,7 +364,7 @@ void SenderWatcher::Dispose() Brn SenderWatcher::Uri() { - DisposeLock lock(*waf tests); + DisposeLock lock(*iDisposeHandler); return iMetadata->Uri(); } diff --git a/oncommit.test b/oncommit.test index 469c1a7..5a8d137 100644 --- a/oncommit.test +++ b/oncommit.test @@ -5,11 +5,11 @@ suiteRunner = MakeSuiteRunner(context) # testharness honours a '#' within this string :) tests = ''' - #TestWatchableThread - #TestWatchable + TestWatchableThread + TestWatchable TestTopology1 -s {ws_hostname} -p {ws_port} --path Topology1TestScript.txt - #TestTopology2 -s {ws_hostname} -p {ws_port} --path Topology2TestScript.txt - #TestTopologym -s {ws_hostname} -p {ws_port} --path TopologymTestScript.txt + TestTopology2 -s {ws_hostname} -p {ws_port} --path Topology2TestScript.txt + TestTopologym -s {ws_hostname} -p {ws_port} --path TopologymTestScript.txt '''