--- a/kerneltest/f32test/concur/t_cfsperform.cpp	Tue Aug 31 16:34:26 2010 +0300
+++ b/kerneltest/f32test/concur/t_cfsperform.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>
@@ -83,7 +82,7 @@
 		return EFalse;
 	TDriveInfo info;
 	r=TheFs.Drive(info,drv);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	return (info.iDriveAtt != 0 && !(info.iDriveAtt & KDriveAttRom));
 	}
 
@@ -96,19 +95,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);
 
@@ -116,14 +115,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;
 	}
@@ -133,9 +132,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)
 		{
@@ -145,7 +144,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);
@@ -160,7 +159,7 @@
 	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)
 		{
@@ -184,7 +183,7 @@
 	r=TheFs.MountFileSystem(gFsName, aDrive);
 #endif
 
-	test_KErrNone(r);
+	test(r==KErrNone);
 	}
 
 enum TOper
@@ -358,7 +357,7 @@
 
 		TInt sizeFile = 0;
 		r = iF.Size(sizeFile);
-		test_KErrNone(r);
+		test(r == KErrNone);
         if (gVerbose)
 			{
 			test.Printf(_L("File Size = %d, %d buffers of size %d\n"), sizeFile, iMax, iBufSize);
@@ -469,7 +468,10 @@
 	for (TInt pos=0; pos<iFileSize; pos+= buf->Length())
 		{
 		r = iF.Write(pos, bufptr);
-		test_KErrNone(r);
+		if (r != KErrNone)
+			test.Printf(_L("Write() returned %d\n"), r);
+
+		test(r == KErrNone);
 		}
 	delete buf; buf = NULL;
 
@@ -650,15 +652,15 @@
 
 
 	r = TheFs.DriveToChar(aDrive1, dc1);
-	test_KErrNone(r);
+	test(r == KErrNone);
 	r = TheFs.DriveToChar(aDrive2, dc2);
-	test_KErrNone(r);
+	test(r == KErrNone);
 
 	// allocate buffers
 	r = f1.Init(dc1, aBufSize1);
-	test_KErrNone(r);
+		test(r == KErrNone);
 	r = f2.Init(dc2, aBufSize2);
-	test_KErrNone(r);
+	test(r == KErrNone);
 
 	
 	_LIT(KSync, " sync");
@@ -684,21 +686,21 @@
 		if (aBufSize1 > 0)
 			{
 			r = f1.CreateReadFile();
-			test_KErrNone(r);
+			test(r == KErrNone);
 			}
 		if (aBufSize2 > 0)
 			{
 			r = f2.CreateReadFile();
-			test_KErrNone(r);
+			test(r == KErrNone);
 			}
 
 		if (aBufSize1 > 0)
 			r = f1.Open(RFileOps::ERead);
-		test_KErrNone(r);
+		test(r == KErrNone);
 		
 		if (aBufSize2 > 0)
 			r = f2.Open(RFileOps::ERead);
-		test_KErrNone(r);
+		test(r == KErrNone);
 
 
 		timer.After(tstat, KTimeBM * KSecond);
@@ -738,13 +740,13 @@
 		if (aBufSize1 > 0)
 			{
 			r = f1.Open(RFileOps::EWrite);
-			test_KErrNone(r);
+			test(r == KErrNone);
 			}
 	
 		if (aBufSize2 > 0)
 			{
 			r = f2.Open(RFileOps::EWrite);
-			test_KErrNone(r);
+			test(r == KErrNone);
 			}
 
 		timer.After(tstat, KTimeBM * KSecond);
@@ -902,7 +904,7 @@
 GLDEF_C void CallTestsL()
 	{
 	TInt r = TTest::Init();
-	test_KErrNone(r);
+	test(r == KErrNone);
 
 	TChar drvch1 = 0;
 	TChar drvch2 = 0;
@@ -961,14 +963,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);
 
 	if (testFs)
 		{
@@ -1049,7 +1051,7 @@
 		UnmountFileSystem(drive1);
 		UnmountFileSystem(drive2);
 		}
-	test_Value(r, r == 0);
+	test(r == 0);
 	}
 
 
@@ -1067,7 +1069,7 @@
     test.Start(_L("Starting tests..."));
 
     r=TheFs.Connect();
-    test_KErrNone(r);
+    test(r==KErrNone);
 
     // TheFs.SetAllocFailure(gAllocFailOn);
     TTime timerC;
@@ -1082,7 +1084,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();