From b47cf3ccb81190327d58ea8ef69ab6233a148574 Mon Sep 17 00:00:00 2001
From: Alexey Shilov <alexey.shilov@nokia.com>
Date: Fri, 2 Sep 2011 16:27:29 +0300
Subject: [PATCH] Changes: fix tests after incorrect rebase RevBy: TrustMe

---
 src/launcherlib/daemon.cpp          |  4 ++++
 tests/harmattan/red-tests/tests.xml | 16 ----------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/launcherlib/daemon.cpp b/src/launcherlib/daemon.cpp
index 4e3a851..084d885 100644
--- a/src/launcherlib/daemon.cpp
+++ b/src/launcherlib/daemon.cpp
@@ -673,6 +673,10 @@ void Daemon::parseArgs(const ArgVect & args)
         {
             usage(EXIT_SUCCESS);
         }
+        else
+        {
+            usage(EXIT_FAILURE);
+        }
     }
 }
 
diff --git a/tests/harmattan/red-tests/tests.xml b/tests/harmattan/red-tests/tests.xml
index a56bf45..2468b8a 100644
--- a/tests/harmattan/red-tests/tests.xml
+++ b/tests/harmattan/red-tests/tests.xml
@@ -30,22 +30,6 @@
         <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-daemons.py test_app_exits_clean</step>
       </case>
 
-      <!--<case name="applauncherd__test_launched_app_wm_class_m" type="Functional" description="Test that launched application have correct WM_CLASS Xproperty booster m" timeout="460" level="System" insignificant="true">
-        <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_launched_app_wm_class_m</step>
-      </case>-->
-
-      <case name="applauncherd__test_launched_app_wm_class_d" type="Functional" description="Test that launched application have correct WM_CLASS Xproperty booster d" timeout="460" level="System" insignificant="true">
-        <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_launched_app_wm_class_d</step>
-      </case>
-
-      <case name="applauncherd__test_launched_app_wm_class_e" type="Functional" description="Test that launched application have correct WM_CLASS Xproperty booster e" timeout="460" level="System" insignificant="true">
-        <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_launched_app_wm_class_e</step>
-      </case>
-
-      <case name="applauncherd__test_launched_app_wm_class_q" type="Functional" description="Test that launched application have correct WM_CLASS Xproperty booster q" timeout="460" level="System" insignificant="true">
-        <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_launched_app_wm_class_q</step>
-      </case>
-
       <case name="applauncherd__test_launched_app_wm_class_m" type="Functional" description="Test that launched application have correct WM_CLASS Xproperty booster m" timeout="460" level="System" insignificant="true">
         <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_launched_app_wm_class_m</step>
       </case>