Merge commit 'origin/master' into my-master

tests/art-tests/tests.xml

@@ -36,12 +36,12 @@
       </get-->
     </set>
 
-    <set name="Prestart-launched" description="To test that prestarted application is launched" feature="AF DUI Booster for Launcher daemon" requirement="300195">   
+    <!--set name="Prestart-launched" description="To test that prestarted application is launched" feature="AF DUI Booster for Launcher daemon" requirement="300195">   
       <pre_steps>
           <step>/usr/bin/waitloadavg.rb -l 1.0 -p 1.0 -t 120</step>
       </pre_steps>
       <case name="Prestart-launched" type="Functional" description="To test that prestarted application is launched" timeout="120" level="System">
-          <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 /usr/share/applauncherd-testscripts/ts_prestartapp.rb --name test_launch_prestarted_app</step>
+          <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 /usr/share/applauncherd-testscripts/ts_prestartapp.rb name test_launch_prestarted_app</step>
       </case>
 
       <environments>
@@ -49,9 +49,9 @@
           <hardware>true</hardware>    
       </environments>
 
-      <!--get>
-      </get-->
-    </set>
+      <get>
+      </get>
+    </set-->
   </suite>
 </testdefinition>
 

tests/functests/tests.xml

@@ -68,12 +68,12 @@
       </environments>
     </set>
     
-    <set name="Prestart-launched" description="To test that prestarted application is launched" feature="AF DUI Booster for Launcher daemon" requirement="300195">   
+    <!--set name="Prestart-launched" description="To test that prestarted application is launched" feature="AF DUI Booster for Launcher daemon" requirement="300195">   
       <pre_steps>
           <step>/usr/bin/waitloadavg.rb -l 1.0 -p 1.0 -t 120</step>
       </pre_steps>
       <case name="Prestart-launched" type="Functional" description="To test that prestarted application is launched" timeout="360" level="System">
-          <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0  /usr/share/applauncherd-testscripts/ts_prestartapp.rb --name test_launch_prestarted_app</step>
+          <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0  /usr/share/applauncherd-testscripts/ts_prestartapp.rb name test_launch_prestarted_app</step>
       </case>
 
       <environments>
@@ -81,9 +81,9 @@
           <hardware>true</hardware>    
       </environments>
 
-      <!--get>
-      </get-->
-    </set>
+      <-get>
+      </get>
+    </set-->
   </suite>
 </testdefinition>
 

tests/perftests/tests.xml

@@ -24,13 +24,13 @@
       </get>
     </set>
 
-    <set name="test-applicationGrid" description="applauncherd application startup time from application grid" feature="AF DUI Booster for Launcher daemon" requirement="300195">   
+    <!--set name="test-applicationGrid" description="applauncherd application startup time from application grid" feature="AF DUI Booster for Launcher daemon" requirement="300195">   
       <pre_steps>
           <step>/usr/bin/waitloadavg.rb -l 1.0 -p 1.0 -t 120</step>
       </pre_steps>
 
       <case name="Perf-Test" type="Performance" description="Measure launcher performance" timeout="360" level="System" insignificant="true">
-	      <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 /usr/share/applauncherd-testscripts/test-perf.rb --name test_performance &gt; /tmp/launcher_perf_new.txt</step>
+	      <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 /usr/share/applauncherd-testscripts/test-perf.rb name test_performance &gt; /tmp/launcher_perf_new.txt</step>
       </case>
       <environments>
           <scratchbox>false</scratchbox>
@@ -40,7 +40,7 @@
       <get>
           <file>/tmp/launcher_perf_new.txt</file>
       </get>
-    </set>
+    </set-->
 
   </suite>
 </testdefinition>