--- a/kerneltest/f32test/manager/t_romg.cpp	Tue Aug 31 16:34:26 2010 +0300
+++ b/kerneltest/f32test/manager/t_romg.cpp	Wed Sep 01 12:34:56 2010 +0100
@@ -15,7 +15,6 @@
 // 
 //
 
-#define	__E32TEST_EXTENSION__
 #include <f32file.h>
 #include <e32test.h>
 #include <e32rom.h>
@@ -453,12 +452,12 @@
 //
 	test.Next(_L("Create root mem dir"));
 	TRAPD(r,TheRootDir=CMemDir::NewL());
-	test_KErrNone(r);
+	test(r==KErrNone);
 //
 	test.Next(_L("Load directory structure"));
 	TheLevel=(-1);
 	TRAP(r,TheRootDir->LoadDirL(n));
-	test_KErrNone(r);
+	test(r==KErrNone);
 	test(TheLevel==(-1));
 //
 	delete buf;
@@ -554,11 +553,11 @@
 		test.End();
 		return;
 		}
-	test_Value(r, r == KErrNone || r==KErrNotFound);
+	test(r==KErrNone || r==KErrNotFound);
 //
 	test.Next(_L("Generating ROM image"));
 	TRAP(r,buildRomImageL());
-	test_KErrNone(r);
+	test(r==KErrNone);
 //
 	test.Next(_L("Basing the rom image"));
 	baseRomImage();
@@ -567,7 +566,7 @@
 	b+=TheFileName;
 	test.Next(b);
 	r=TheFile.Replace(TheFs,TheFileName,EFileStream|EFileWrite);
-	test_KErrNone(r);
+	test(r==KErrNone);
 	writeRomImage();
 	TheFile.Close();
 	delete TheRootDir;