--- a/kerneltest/f32test/server/clean_prepdc.cpp	Tue Aug 31 16:34:26 2010 +0300
+++ b/kerneltest/f32test/server/clean_prepdc.cpp	Wed Sep 01 12:34:56 2010 +0100
@@ -18,7 +18,6 @@
 //
 
 
-#define __E32TEST_EXTENSION__
 #include <f32file.h>
 #include <e32test.h>
 #include <e32std.h>
@@ -57,11 +56,11 @@
 	{
 	CFileMan* fMan=CFileMan::NewL(TheFs);
 	TInt r=fMan->RmDir(_L("\\Resource\\"));
-	test_Value(r, r == KErrNone || r==KErrPathNotFound);
+	test(r==KErrNone || r==KErrPathNotFound);
 	r=fMan->RmDir(_L("\\Sys\\"));
-	test_Value(r, r == KErrNone || r==KErrPathNotFound);
+	test(r==KErrNone || r==KErrPathNotFound);
 	r=fMan->RmDir(_L("\\Private\\"));
-	test_Value(r, r == KErrNone || r==KErrPathNotFound);
+	test(r==KErrNone || r==KErrPathNotFound);
 	delete fMan;
 	}
 
@@ -71,12 +70,12 @@
 //
 	{
 	TInt r=TheFs.MkDir(_L("\\Resource\\"));
-	test_KErrNone(r);
+	test(r==KErrNone);
 	r=TheFs.MkDir(_L("\\Sys\\"));
-	test_KErrNone(r);
+	test(r==KErrNone);
 	RFile f;
 	r=f.Create(TheFs,_L("\\Resource\\resourcefile.txt"),EFileWrite);
-	test_Value(r, r == KErrNone || r==KErrAlreadyExists);
+	test(r==KErrNone || r==KErrAlreadyExists);
 	f.Close();
 	}	
 
@@ -87,7 +86,7 @@
 	{
 	TBuf<30> tmp;
 	TInt r= TheFs.SessionPath(tmp);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	RDebug::Print(_L("sessp=%S"),&tmp);
 	CleanupL();
 	TestSetup();