diff -r a232af6b0b1f -r a5496987b1da kerneltest/f32test/server/t_mmc.cpp --- a/kerneltest/f32test/server/t_mmc.cpp Wed Jun 23 12:58:21 2010 +0100 +++ b/kerneltest/f32test/server/t_mmc.cpp Thu Jul 01 17:57:33 2010 +0100 @@ -21,6 +21,7 @@ // +#define __E32TEST_EXTENSION__ #include #include #include @@ -170,7 +171,7 @@ r = TheFs.Delete(mediaPWrdFile); } while (r == KErrInUse); - test(r == KErrNone || r == KErrNotFound); + test_Value(r, r == KErrNone || r == KErrNotFound); } @@ -653,7 +654,7 @@ User::After(1 * 1000 * 1000); // wait to finish writing r = TheFs.Delete(mediaPWrdFile); - test(r == KErrNone || r == KErrNotFound); + test_Value(r, r == KErrNone || r == KErrNotFound); test(TBusLocalDrive::WritePasswordData(noMappings) == KErrNone); // check contents of password file correspond to last written buffer. @@ -816,7 +817,7 @@ mediaPWrdFile[0] = (TUint8) RFs::GetSystemDriveChar(); TParsePtrC ppc(mediaPWrdFile); TInt r = TheFs.MkDir(ppc.DriveAndPath()); - test(r == KErrNone || r == KErrAlreadyExists); + test_Value(r, r == KErrNone || r == KErrAlreadyExists); // The media driver for the protected area of the SD card uses mount // info. This is also used for password unlocking by the MMC media driver.