--- a/kerneltest/f32test/server/t_corruptlog.cpp	Mon May 03 13:47:38 2010 +0300
+++ b/kerneltest/f32test/server/t_corruptlog.cpp	Fri May 14 17:13:29 2010 +0300
@@ -24,6 +24,7 @@
 //! @SYMCreationDate 1/11/04
 //! @SYMTestCaseDesc Check trap action of CorruptFileNames.lst
 
+#define __E32TEST_EXTENSION__
 #include <e32test.h>
 RTest test(_L("t_corruptlog"));
 
@@ -106,7 +107,7 @@
 	// Note that C: is used in the IoControl call, which requires a valid drive, but has no other relevance
 	TInt numberOfRecords;
 	TInt r=controlIo(TheFs, EDriveC, KControlIoGetNumberOfCorruptLogRecords, numberOfRecords);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	return numberOfRecords;
 	}
 
@@ -115,7 +116,7 @@
 	// fetchs a trap record
 	// Note that C: is used in the IoControl call, which requires a valid drive, but has no other relevance
 	TInt r=controlIo(TheFs, EDriveC, KControlIoGetCorruptLogRecord, alogRec, aRecordNumber);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	return r;
 	}
 
@@ -125,7 +126,7 @@
 	// the corrupt files list.
 	// Note that C: is used in the IoControl call, which requires a valid drive, but has no other relevance
 	TInt r=controlIo(TheFs, EDriveC, KControlIoGetCorruptListFile, aFileName);
-	test(r==KErrNone);
+	test_KErrNone(r);
 	return r;
 	}
 
@@ -136,22 +137,22 @@
 	const TInt attribs=EFileShareExclusive|EFileStreamText|EFileRead;
 	// File1 
 	TInt r=f.Open(TheFs,KTestFile1,attribs);
-	test(r==KTestFile1Error1);
+	test_Value(r, r == KTestFile1Error1);
 	f.Close();
 	numberOfTraps+=(r==KErrNone?0:1);
 	// try again
 	r=f.Open(TheFs,KTestFile1,attribs);
-	test(r==KTestFile1Error2);
+	test_Value(r, r == KTestFile1Error2);
 	f.Close();
 	numberOfTraps+=(r==KErrNone?0:1);
 	// File2 
 	r=f.Open(TheFs,KTestFile2,attribs);
-	test(r==KTestFile2Error1);
+	test_Value(r, r == KTestFile2Error1);
 	f.Close();
 	numberOfTraps+=(r==KErrNone?0:1);
 	// try again
 	r=f.Open(TheFs,KTestFile2,attribs);
-	test(r==KTestFile2Error2);
+	test_Value(r, r == KTestFile2Error2);
 	f.Close();
 	numberOfTraps+=(r==KErrNone?0:1);
 	}
@@ -161,7 +162,7 @@
 	TFileName corruptFileNamesList;
     test.Next(_L("Get name of file with list of nominated files"));
 	TInt r=GetCorruptFileListFile(corruptFileNamesList);
-    test(r==KErrNone);
+    test_KErrNone(r);
  	test.Printf(_L("Using %S\n"),&corruptFileNamesList);
 
 	AccessFiles();
@@ -174,9 +175,9 @@
 	for (TInt i=1;i<=nRecs;i++)
 		{ // fetch record #i
 		TInt r=GetTrapLogRecord(logRec,i);
-		test(r==KErrNone);
+		test_KErrNone(r);
 		r=logRec().iProcessName.CompareF(_L("t_corruptlog.exe"));
-		test(r==KErrNone);
+		test_KErrNone(r);
 		PrintLogRecord(logRec,i);
 		}
 	}
@@ -194,7 +195,7 @@
     test.Start(_L("Corrupt File trap log"));
 #if defined(_DEBUG) || defined(_DEBUG_RELEASE)
 	TInt r=TheFs.Connect();
-    test(r==KErrNone);
+    test_KErrNone(r);
 
     TheFs.ResourceCountMarkStart();