Fixed build error

openhome · Apr 1, 2014 · 160f9be · 160f9be
1 parent 7f29ba9
commit 160f9be
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git 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<Brn>& 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
@@ -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
@@ -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
     '''