diff -r c1f20ce4abcf -r 3e88ff8f41d5 kerneltest/f32test/concur/t_cfsbench.cpp
--- a/kerneltest/f32test/concur/t_cfsbench.cpp	Tue Aug 31 16:34:26 2010 +0300
+++ b/kerneltest/f32test/concur/t_cfsbench.cpp	Wed Sep 01 12:34:56 2010 +0100
@@ -17,7 +17,6 @@
 
 //! @file f32test\concur\t_cfsbench.cpp
 
-#define	__E32TEST_EXTENSION__
 #include <f32file.h>
 #include <e32test.h>
 #include <f32dbg.h>
@@ -119,7 +118,7 @@
 		return EFalse;
 	TDriveInfo info;
 	r=TheFs.Drive(info,drv);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	return (info.iDriveAtt != 0 && !(info.iDriveAtt & KDriveAttRom));
 	}
 
@@ -132,19 +131,19 @@
 	TBuf<64> b;
 	TChar c;
 	r=TheFs.DriveToChar(aDrive,c);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	b.Format(_L("Mount test file system on %c:"),(TUint)c);
 	test.Next(b);
 
 	r=TheFs.AddFileSystem(KFsFile);
-	test_Value(r, r == KErrNone || r==KErrAlreadyExists);
+	test(r==KErrNone || r==KErrAlreadyExists);
 
 	r=TheFs.FileSystemName(gOldFsName,aDrive);
-	test_Value(r, r == KErrNone || r==KErrNotFound);
+	test(r==KErrNone || r==KErrNotFound);
 
 	TDriveInfo drv;
 	r = TheFs.Drive(drv, aDrive);
-	test_KErrNone(r);
+	test(r == KErrNone);
 
 	gNoMedia = (drv.iType == EMediaUnknown || drv.iType == EMediaNotPresent);
 
@@ -152,14 +151,14 @@
 		{
 		TTest::Printf(_L("Dismount %C: %S"), (TUint)c, &gOldFsName);
 		r=TheFs.DismountFileSystem(gOldFsName,aDrive);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		}
 
 	r=TheFs.MountFileSystem(KFsName,aDrive);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	r=TheFs.FileSystemName(gNewFsName,aDrive);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test(gNewFsName.CompareF(KFsName)==0);
 	return c;
 	}
@@ -169,9 +168,9 @@
 	{
 	TChar c;
 	TInt r=TheFs.DriveToChar(aDrive,c);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.DismountFileSystem(gNewFsName,aDrive);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	// if there's no media present, don't try to mount it
 	if (gNoMedia)
 		{
@@ -181,7 +180,7 @@
 		{
 		test.Printf(_L("Mount    %C: %S"), (TUint)c, &gOldFsName);
 		r=TheFs.MountFileSystem(gOldFsName,aDrive);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		}
 	if (r != KErrNone)
 		test.Printf(_L("Error %d remounting %S on %C\n"), r, &gOldFsName, (TUint)c);
@@ -196,12 +195,16 @@
 	TChar c;
 	TInt r=TheFs.DriveToChar(aDrive,c);
 	r=TheFs.FileSystemName(gFsName, aDrive);
-	test_Value(r, r == KErrNone || r==KErrNotFound);
+	test(r==KErrNone || r==KErrNotFound);
 
 	if (gFsName.Length() > 0)
 		{
 		r=TheFs.DismountFileSystem(gFsName, aDrive);
-		test_KErrNone(r);
+		if(r!=KErrNone)
+			{
+			test.Printf(_L("Error = %d"),r);
+			test(EFalse);
+			}
 		}
 
 	TBufC<16> type = _L("asynchronous");
@@ -215,7 +218,7 @@
 	r=TheFs.MountFileSystem(gFsName, aDrive);
 #endif
 
-	test_KErrNone(r);
+	test(r==KErrNone);
 	}
 
 enum TOper
@@ -864,7 +867,7 @@
 //
 	{
 	TInt r = TTest::Init();
-	test_KErrNone(r);
+	test(r == KErrNone);
 
 	TChar drvch0 = TTest::DefaultDriveChar();
 	TChar drvch1 = 0;
@@ -884,7 +887,7 @@
 		drvch2 = User::UpperCase(argv[3][0]);
 
 	r = TheFs.CharToDrive(drvch0, drive0);
-	test_KErrNone(r);
+	test(r == KErrNone);
 
 	if (TheFs.IsValidDrive(drive0))
 		MountTestFileSystem(drive0);
@@ -899,14 +902,14 @@
 		}
 
 	r = TheFs.CharToDrive(drvch1, drive1);
-	test_KErrNone(r);
+	test(r == KErrNone);
 	r = TheFs.CharToDrive(drvch2, drive2);
-	test_KErrNone(r);
+	test(r == KErrNone);
 
 	r = TheFs.FileSystemName(gFsName1, drive1);
-	test_Value(r, r == KErrNone || r == KErrNotFound);
+	test(r == KErrNone || r == KErrNotFound);
 	r = TheFs.FileSystemName(gFsName2, drive2);
-	test_Value(r, r == KErrNone || r == KErrNotFound);
+	test(r == KErrNone || r == KErrNotFound);
 
 	gDataLock.CreateLocal();
 
@@ -1036,7 +1039,7 @@
 	gDataLock.Close();
 
 	UnmountFileSystem(drive0);
-	test_Value(r, r == 0);
+	test(r == 0);
 	}
 
 
@@ -1055,7 +1058,7 @@
     test.Start(_L("Starting tests..."));
 
     r=TheFs.Connect();
-    test_KErrNone(r);
+    test(r==KErrNone);
 
     // TheFs.SetAllocFailure(gAllocFailOn);
     TTime timerC;
@@ -1071,7 +1074,7 @@
     endTimeC.HomeTime();
     TTimeIntervalSeconds timeTakenC;
     r=endTimeC.SecondsFrom(timerC,timeTakenC);
-    test_KErrNone(r);
+    test(r==KErrNone);
     test.Printf(_L("Time taken for test = %d seconds\n"),timeTakenC.Int());
     // TheFs.SetAllocFailure(gAllocFailOff);
     TheFs.Close();