# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1265219696 0
# Node ID f8c11c123fb51694b45606eca81faf6bc2851a49
# Parent  c108117318cb23973d84e507b83344fe9858fe5f# Parent  450c3c3f54988b28920f072c5028b5ef1b970a52
Merge

diff -r c108117318cb -r f8c11c123fb5 Group/bld.inf
--- a/Group/bld.inf	Wed Feb 03 17:01:52 2010 +0000
+++ b/Group/bld.inf	Wed Feb 03 17:54:56 2010 +0000
@@ -22,7 +22,7 @@
 #include "../messaging/Group/bld.inf"
 #include "../System/Group/bld.inf"
 //#include "../Timew/Group/bld.inf"
-#include "../email/group/bld.inf"
+//#include "../email/group/bld.inf"
 #include "../profiles/group/Bld.inf"
 #include "../notepad/group/bld.inf"
 #include "../appinstall/group/Bld.inf"
@@ -32,7 +32,7 @@
 //#include "../IM/group/bld.inf"
 //#include "../localisation/uiftestfw/group/BLD.INF"
 //#include "../localisation/apparchitecture/group/BLD.INF"
-#include "../graphics/wserv/group/bld.inf"
+//#include "../graphics/wserv/group/bld.inf"
 #include "../http/group/bld.inf"
 #include "../mediamgmt/group/Bld.inf"
 #include "../browser/group/Bld.inf"
diff -r c108117318cb -r f8c11c123fb5 Group/smoketest.xml
--- a/Group/smoketest.xml	Wed Feb 03 17:01:52 2010 +0000
+++ b/Group/smoketest.xml	Wed Feb 03 17:54:56 2010 +0000
@@ -47,7 +47,7 @@
 							<param component-path="smoketest\sms" />
 						</params>
 					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="false" passrate="100" significant="false">
 						<command>install</command>
 						<params>
 							<param type="data"/>
@@ -56,7 +56,7 @@
 							<param component-path="smoketest\emailmessage" />
 						</params>
 					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="false" passrate="100" significant="false">
 						<command>install</command>
 						<params>
 							<param type="data"/>
@@ -416,7 +416,7 @@
 							<param component-path="smoketest\localisation" />
 						</params>
 					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="false" passrate="100" significant="false">
 						<command>install</command>
 						<params>
 							<param type="data"/>
@@ -515,7 +515,7 @@
 							<param component-path="smoketest" />
 						</params>
 					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="false" passrate="100" significant="false">
 						<command>install</command>
 						<params>
 							<param type="binary"/>
@@ -524,7 +524,7 @@
 							<param component-path="smoketest" />
 						</params>
 					</step>					
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="false" passrate="100" significant="false">
 						<command>install</command>
 						<params>
 							<param type="binary"/>
@@ -533,7 +533,7 @@
 							<param component-path="smoketest" />
 						</params>
 					</step>					
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="false" passrate="100" significant="false">
 						<command>install</command>
 						<params>
 							<param type="binary"/>
@@ -650,7 +650,7 @@
 							<param component-path="smoketest" />
 						</params>
 					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="false" passrate="100" significant="false">
 						<command>install</command>
 						<params>
 							<param type="binary"/>
@@ -659,7 +659,7 @@
 							<param component-path="smoketest" />
 						</params>
 					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="false" passrate="100" significant="false">
 						<command>install</command>
 						<params>
 							<param type="binary"/>
@@ -668,7 +668,7 @@
 							<param component-path="smoketest" />
 						</params>
 					</step>
-						<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="false" passrate="100" significant="false">
 						<command>install</command>
 						<params>
 							<param type="binary"/>
@@ -677,7 +677,7 @@
 							<param component-path="smoketest" />
 						</params>
 					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="false" passrate="100" significant="false">
 						<command>install</command>
 						<params>
 							<param type="binary"/>
@@ -750,7 +750,7 @@
 							<param leave-old-result="true"/>
 						</params>
 					</step>
-					<step id="" name="Test Step 2 (execute)" harness="GENERIC" enabled="true" passrate="100" significant="true">
+					<step id="" name="Test Step 2 (execute)" harness="GENERIC" enabled="false" passrate="100" significant="true">
 						<command>execute</command>
 						<params>
 							<param file="testexecute.exe"/>
@@ -783,7 +783,7 @@
 							<param leave-old-result="true"/>
 						</params>
 					</step>
-					<step id="" name="Test Step 2 (execute)" harness="GENERIC" enabled="true" passrate="100" significant="true">
+					<step id="" name="Test Step 2 (execute)" harness="GENERIC" enabled="false" passrate="100" significant="true">
 						<command>execute</command>
 						<params>
 							<param file="testexecute.exe"/>
@@ -835,7 +835,7 @@
 							<param leave-old-result="true"/>
 						</params>
 					</step>
-					<step id="" name="Test Step 3 (fetch-log)" harness="GENERIC" enabled="true" passrate="100">
+					<step id="" name="Test Step 3 (fetch-log)" harness="GENERIC" enabled="false" passrate="100">
 						<command>fetch-log</command>
 						<params>
 							<param path="c:\logs\testexecute\screen.mbm" /> 
@@ -1163,20 +1163,13 @@
 		<file>smoketest/general/smoketest_mess.ini</file>
 		<file>smoketest/general/smoketest_mess.script</file>
 
-		<file>smoketest/general/smoketest_email.ini</file>
-		<file>smoketest/general/smoketest_email.script</file>
 
 
-		<file>smoketest/general/smoketest_bitmap.ini</file>
-		<file>smoketest/general/smoketest_bitmap.script</file>
+
 		<file>smoketest/general/smoketest_http.ini</file>
 		<file>smoketest/general/smoketest_http.script</file>
 		<file>smoketest/sms/general/message1.txt</file>
-		<file>smoketest/general/MachineName.txt</file>
-		<file>smoketest/emailmessage/general/20KBody.txt</file>
-		<file>smoketest/emailsettings/general/popsettings_test908.txt</file>
 
-		<file>smoketest/bitmap/general/uibench_16bit.mbm</file>
 		<file>smoketest/ethernet/general/delproxy.pl</file>
 		<file>smoketest/winscw_udeb/SmokeTestSecureFSclient.dll</file>
 		<file>smoketest/winscw_udeb/SmokeTestSecureFSserver.exe</file>
@@ -1187,15 +1180,9 @@
 		<file>smoketest/winscw_udeb/Smoketest_System.exe</file>
 
 		<file>smoketest/winscw_udeb/SmokeTest_Utils.dll</file>
-		<file>smoketest/winscw_udeb/t_msgutilityserver.dll</file>
-		<file>smoketest/winscw_udeb/t_msgpopserver.exe</file>
-		<file>smoketest/winscw_udeb/t_msgsmtpserver.exe</file>
+
 
 		
-		<file>smoketest/winscw_udeb/t_animplugin.dll</file>
-		<file>smoketest/winscw_udeb/t_graphicswservapi.exe</file>
-		<file>smoketest/winscw_udeb/twsgraphicshare.exe</file>
-		<file>smoketest/winscw_udeb/twsgraphicunshare.exe</file>
 		<file>smoketest/winscw_udeb/testhttpsuite.exe</file>
         <file>smoketest/winscw_udeb/ProfileSmokeTestModule.dll</file>
         <file>smoketest/general/ProfileSmokeTestModule.cfg</file>
diff -r c108117318cb -r f8c11c123fb5 apploader/testdata/smoketest_apploader.ini
--- a/apploader/testdata/smoketest_apploader.ini	Wed Feb 03 17:01:52 2010 +0000
+++ b/apploader/testdata/smoketest_apploader.ini	Wed Feb 03 17:54:56 2010 +0000
@@ -11,7 +11,7 @@
 program	=Clock
 
 [SMOKE_APP_RUNNING_0004]
-program	=Messages
+program	=Messaging
 
 [SMOKE_APP_LAUNCH_0005]
 program	=NSmlDSSync.exe
@@ -23,7 +23,7 @@
 program	=Calendar
 
 [SMOKE_APP_RUNNING_0007]
-program	=Phonebook 2
+program	=Contacts
 
 [SMOKE_APP_KEYEVENTS_0008]
 delay1	=2000
@@ -51,4 +51,4 @@
 program	=Notepad.exe
 
 [SMOKE_APP_END_0011]
-program	=Notepad
+program	=Notes
diff -r c108117318cb -r f8c11c123fb5 browser/inc/BrCtlApiTestContainer.h
--- a/browser/inc/BrCtlApiTestContainer.h	Wed Feb 03 17:01:52 2010 +0000
+++ b/browser/inc/BrCtlApiTestContainer.h	Wed Feb 03 17:54:56 2010 +0000
@@ -29,8 +29,10 @@
 // CONSTATNS
 const TInt KThisAppUid = 0xA0000181;
 
-_LIT( KUrlLoadTestHtml, "c:\\BrCtlTest\\loadtest.html" );
-_LIT( KUrlLoadTestHtml2, "file:///c:\\smoketest\\web\\loadtest2.html" );
+//_LIT( KUrlLoadTestHtml, "c:\\BrCtlTest\\loadtest.html" );
+_LIT( KUrlLoadTestHtml, "c:\\smoketest\\web\\loadtest2.html" );
+//_LIT( KUrlLoadTestHtml2, "file:///c:\\smoketest\\web\\loadtest2.html" );
+_LIT( KUrlLoadTestHtml2, "file:////c:\\smoketest\\web\\loadtest2.html" );
 _LIT( KUrlHistoryHandlerHtml1, "file:///c:\\BrCtlTest\\historytest1.html" );
 _LIT( KUrlHistoryHandlerHtml2, "file:///c:\\BrCtlTest\\historytest2.html" );
 _LIT( KUrlHistoryHandlerHtml3, "file:///c:\\BrCtlTest\\historytest3.html" );