diff -r 26645d81f48d -r cc28652e0254 persistentstorage/centralrepository/test/t_cenrep_rfs.cpp --- a/persistentstorage/centralrepository/test/t_cenrep_rfs.cpp Tue Aug 31 16:57:14 2010 +0300 +++ b/persistentstorage/centralrepository/test/t_cenrep_rfs.cpp Wed Sep 01 12:39:58 2010 +0100 @@ -73,17 +73,6 @@ #define TEST(arg) ::CheckL((arg), __LINE__) #define TEST2(aValue, aExpected) ::CheckL(aValue, aExpected, __LINE__) -// This function kills the C32exe.exe process. This commsdat process will -// interfere with the test if not killed. In a nutshell, some of the test cases -// will kill and then wait for 2 seconds and restart the centrep server -// with --SoftReset option. During that 2 seconds wait sometimes C32exe.exe -// will use centrep API, thus starting the server normally without --SoftReset. -LOCAL_C void KillC32Exe() - { - _LIT( KC32ServerName, "c32exe"); - KillProcess(KC32ServerName); // Don't need to check the return code, it always return KErrNone anyway. - User::After(KGeneralDelay); - } //This function restores the state of the files required for this test //Existing files are deleted and then the required files are copied @@ -633,7 +622,6 @@ { TheTest.Start(_L(" @SYMTestCaseID:SYSLIB-CENTRALREPOSITORY-CT-0497-0001 Restore Factory Settings tests ")); CleanupCDriveL(); - KillC32Exe(); //Need to kill C32Exe as it is interfering with the test. RestoreFactorySettingsTestL(); PDEF105203(); RFSRomOnlyL();