diff -r c1f20ce4abcf -r 3e88ff8f41d5 kerneltest/f32test/fsstress/t_remote.cpp
--- a/kerneltest/f32test/fsstress/t_remote.cpp	Tue Aug 31 16:34:26 2010 +0300
+++ b/kerneltest/f32test/fsstress/t_remote.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(__T_STD_H__)
@@ -109,15 +108,15 @@
 	fn = _L("Z:\\TEST\\T_FSRV.CPP");
 	fn[0] = gExeFileName[0];
 	TInt r=file1.Open(TheFs,fn,EFileRead|EFileShareReadersOnly);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	fn = _L("Z:\\TEST\\T_FILE.CPP");
 	fn[0] = gExeFileName[0];
 	r=file2.Open(TheFs,fn,EFileRead);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	fn = _L("Z:\\TEST\\T_FSRV.CPP");
 	fn[0] = gExeFileName[0];
 	r=file3.Open(TheFs,fn,EFileRead|EFileShareReadersOnly);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	
 	CFileList* list;
 	TOpenFileScan fileScan(TheFs);
@@ -165,28 +164,28 @@
 
 	RFs fs1,fs2,fs3,fs4;
 	TInt r=fs1.Connect();
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=fs2.Connect();
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=fs3.Connect();
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=fs4.Connect();
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	RFile file1,file2,file3;
 	TFileName fn;
 	fn = _L("Z:\\TEST\\T_FSRV.CPP");
 	fn[0] = gExeFileName[0];
 	r=file1.Open(fs2,fn,EFileRead|EFileShareReadersOnly);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	fn = _L("Z:\\TEST\\T_FILE.CPP");
 	fn[0] = gExeFileName[0];
 	r=file2.Open(fs2,fn,EFileRead);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	fn = _L("Z:\\TEST\\T_FSRV.CPP");
 	fn[0] = gExeFileName[0];
 	r=file3.Open(fs2,fn,EFileRead|EFileShareReadersOnly);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	
 	CFileList* list;
 	TOpenFileScan fileScan(TheFs);
@@ -238,39 +237,39 @@
 
 	RFs fs1,fs2,fs3,fs4;
 	TInt r=fs1.Connect();
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=fs2.Connect();
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=fs3.Connect();
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=fs4.Connect();
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	RFile file1,file2,file3;
 	TFileName fn;
 	fn = _L("Z:\\TEST\\T_FSRV.CPP");
 	fn[0] = gExeFileName[0];
 	r=file1.Open(fs2,fn,EFileRead|EFileShareReadersOnly);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	fn = _L("Z:\\TEST\\T_FILE.CPP");
 	fn[0] = gExeFileName[0];
 	r=file2.Open(fs2,fn,EFileRead|EFileShareReadersOnly);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	fn = _L("Z:\\TEST\\T_FSRV.CPP");
 	fn[0] = gExeFileName[0];
 	r=file3.Open(fs2,fn,EFileRead|EFileShareReadersOnly);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	
 	r=file1.Open(fs4,fn,EFileRead|EFileShareReadersOnly);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	fn = _L("Z:\\TEST\\T_FILE.CPP");
 	fn[0] = gExeFileName[0];
 	r=file2.Open(fs4,fn,EFileRead|EFileShareReadersOnly);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	fn = _L("Z:\\TEST\\T_FSRV.CPP");
 	fn[0] = gExeFileName[0];
 	r=file3.Open(fs4,fn,EFileRead|EFileShareReadersOnly);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	
 	CFileList* list;
 	TOpenFileScan fileScan(TheFs);
@@ -338,51 +337,51 @@
 	RFs fs1,fs2,fs3,fs4;
 	TFileName fn;
 	TInt r=fs1.Connect();
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=fs2.Connect();
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=fs3.Connect();
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=fs4.Connect();
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	RDir dir1,dir2,dir3,dir4;
 	fn = _L("Z:\\TEST\\*.XDE");
 	fn[0] = gExeFileName[0];
 	r=dir1.Open(TheFs,fn,KEntryAttMaskSupported);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=dir2.Open(TheFs,fn,KEntryAttMaskSupported);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=dir3.Open(TheFs,fn,KEntryAttMaskSupported);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=dir4.Open(TheFs,fn,KEntryAttMaskSupported);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	RFile file1,file2,file3;
 	fn = _L("Z:\\TEST\\T_FSRV.CPP");
 	fn[0] = gExeFileName[0];
 	r=file1.Open(fs2,fn,EFileRead|EFileShareReadersOnly);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	fn = _L("Z:\\TEST\\T_FILE.CPP");
 	fn[0] = gExeFileName[0];
 	r=file2.Open(fs2,fn,EFileRead);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	fn = _L("Z:\\TEST\\T_FSRV.CPP");
 	fn[0] = gExeFileName[0];
 	r=file3.Open(fs2,fn,EFileRead|EFileShareReadersOnly);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	
 	RDir dir5,dir6,dir7,dir8;
 	fn = _L("Z:\\TEST\\*.XDE");
 	fn[0] = gExeFileName[0];
 	r=dir5.Open(fs4,fn,KEntryAttMaskSupported);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=dir6.Open(fs4,fn,KEntryAttMaskSupported);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=dir7.Open(fs4,fn,KEntryAttMaskSupported);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=dir8.Open(fs4,fn,KEntryAttMaskSupported);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	CFileList* list;
 	TOpenFileScan fileScan(TheFs);
@@ -440,27 +439,27 @@
 	fn = _L("Z:\\TEST\\T_FSRV.CPP");
 	fn[0] = gExeFileName[0];
 	TInt r=file1.Open(TheFs,fn,EFileRead|EFileShareReadersOnly);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	fn = _L("Z:\\TEST\\T_FILE.CPP");
 	fn[0] = gExeFileName[0];
 	r=file2.Open(TheFs,fn,EFileRead);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	fn = _L("Z:\\TEST\\T_FSRV.CPP");
 	fn[0] = gExeFileName[0];
 	r=file3.Open(TheFs,fn,EFileRead|EFileShareReadersOnly);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	
 	RDir dir1,dir2,dir3,dir4;
 	fn = _L("Z:\\TEST\\*.XDE");
 	fn[0] = gExeFileName[0];
 	r=dir1.Open(TheFs,fn,KEntryAttMaskSupported);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=dir2.Open(TheFs,fn,KEntryAttMaskSupported);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=dir3.Open(TheFs,fn,KEntryAttMaskSupported);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=dir4.Open(TheFs,fn,KEntryAttMaskSupported);
-	test_KErrNone(r);
+	test(r==KErrNone);
 
 	CFileList* list;
 	TOpenFileScan fileScan(TheFs);
@@ -526,7 +525,7 @@
 	for (; i<maxNumberSessions; i++)
 		{
 		r=session[i].Connect();
-		test_KErrNone(r);
+		test(r==KErrNone);
 		testObject[i].Initialise(session[i]);
 		testObject[i].SetSessionPath(aDrive);
 		testObject[i].RunTests(aTest);		//	Run the set of tests for each session
@@ -552,7 +551,7 @@
 		testObject[i+1].testDriveList(aTest);
 	//	Reconnect session[i]	
 		r=session[i].Connect();
-		test_KErrNone(r);
+		test(r==KErrNone);
 		testObject[i].Initialise(session[i]);
 		testObject[i].SetSessionPath(aDrive);
 		testObject[i].testSetVolume(aTest);
@@ -570,7 +569,7 @@
 		testObject[i].testDriveList(aTest);
 	//	Reconnect session[i+1]	
 		r=session[i+1].Connect();
-		test_KErrNone(r);
+		test(r==KErrNone);
 		testObject[i+1].Initialise(session[i+1]);
 		testObject[i+1].SetSessionPath(aDrive);
 		testObject[i].testSetVolume(aTest);