--- a/kerneltest/f32test/fsstress/t_rmain.cpp	Tue Aug 31 16:34:26 2010 +0300
+++ b/kerneltest/f32test/fsstress/t_rmain.cpp	Wed Sep 01 12:34:56 2010 +0100
@@ -19,7 +19,6 @@
 #include <f32file.h>
 #endif
 #if !defined(__E32TEST_H__)
-#define	__E32TEST_EXTENSION__
 #include <e32test.h>
 #endif
 #if !defined(__E32HAL_H__)
@@ -78,11 +77,11 @@
 	RFormat format;
 	TInt count;
 	TInt r=format.Open(TheFs,driveBuf,EHighDensity,count);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	while(count)
 		{
 		TInt r=format.Next(count);
-		test_KErrNone(r);
+		test(r==KErrNone);
 		}
 	format.Close();
 	}
@@ -108,12 +107,12 @@
 	gSessionPath=_L("?:\\F32-TST\\");
 	TChar driveLetter;
 	TInt r=TheFs.DriveToChar(aDrive,driveLetter);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	gSessionPath[0]=(TText)driveLetter;
 	r=TheFs.SetSessionPath(gSessionPath);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.MkDirAll(gSessionPath);
-	test_Value(r, r == KErrNone || r==KErrAlreadyExists);
+	test(r==KErrNone || r==KErrAlreadyExists);
 	TheFs.ResourceCountMarkStart();
 	
 	switch(aDrive)
@@ -270,7 +269,7 @@
 	test.Title();
 	test.Start(_L("Starting tests..."));
 	r=TheFs.Connect();
-	test_KErrNone(r);
+	test(r==KErrNone);
 //	TheFs.SetAllocFailure(gAllocFailOn);
 
 //	Default drive testing
@@ -279,7 +278,7 @@
 //	Remote drive testing
 	RThread clientThreadQ;
 	r=clientThreadQ.Create(_L("TestRemoteDrive"), TestRemoteDrive, KDefaultStackSize,KHeapSize,KHeapSize,NULL);	
-	test_KErrNone(r);	
+	test(r==KErrNone);	
 	TRequestStatus statq;
 	clientThreadQ.Logon(statq);
 	test.Next(_L("Resume clientThreadQ"));	
@@ -288,7 +287,7 @@
 //	MARM CF card drive testing (WINS emulates CF card on X)
 	RThread clientThreadX;
 	r=clientThreadX.Create(_L("TestXDrive"), TestXDrive, KDefaultStackSize,KHeapSize,KHeapSize,NULL);	
-	test_KErrNone(r);	
+	test(r==KErrNone);	
 	TRequestStatus statx;
 	clientThreadX.Logon(statx);
 	test.Next(_L("Resume clientThreadX"));	
@@ -297,7 +296,7 @@
 //	MARM RAM drive testing (WINS emulates FAT filesystem on Y)  	
 	RThread clientThreadY;
 	r=clientThreadY.Create(_L("TestYDrive"), TestYDrive, KDefaultStackSize,KHeapSize,KHeapSize,NULL);	
-	test_KErrNone(r);	
+	test(r==KErrNone);	
 	TRequestStatus staty;
 	clientThreadY.Logon(staty);
 	test.Next(_L("Resume clientThreadY"));