--- a/kerneltest/f32test/group/bld.inf	Thu Aug 19 11:14:22 2010 +0300
+++ b/kerneltest/f32test/group/bld.inf	Tue Aug 31 16:34:26 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1998-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of the License "Eclipse Public License v1.0"
@@ -26,9 +26,9 @@
 
 PRJ_TESTEXPORTS
 
-../../../userlibandfileserver/fileserver/shostmassstorage/client/rusbhostmslogicalunit.h        /epoc32/include/
+../../../userlibandfileserver/fileserver/shostmassstorage/client/rusbhostmslogicalunit.h        OS_LAYER_PLATFORM_EXPORT_PATH(rusbhostmslogicalunit.h)
 
-../../../userlibandfileserver/fileserver/inc/runtests.h                         /epoc32/include/
+../../../userlibandfileserver/fileserver/inc/runtests.h                         OS_LAYER_PLATFORM_EXPORT_PATH(runtests.h)
 
 PRJ_TESTMMPFILES
 ../../e32test/mediaext/t_nfe
@@ -156,7 +156,7 @@
 //t_scndr1    manual //-- obsolte; replaced by t_scn32dr1
 //t_scndr2    manual //-- obsolte; replaced by t_scn32dr2
 //T_MMC     manual
-t_pwstr manual
+t_pwstr
 
 
 t_fsys
@@ -252,7 +252,7 @@
 
 t_swapfsys manual
 #include "../filesystem/fat/group/fatfs.inf"
-#include "../filesystem/automounter/bld.inf"
+#include "../filesystem/automounter/automounter.inf"
 
 
 #include "perf_test.inf"
@@ -263,14 +263,14 @@
 
 t_localtime 
 
+t_dircache
+
 #ifdef SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API
 t_file64bit manual
 fhserver64bit       support
 #include "../plugins/version_2/file64bit/group/file64bit_plugin.inf"
 #endif
 
-t_ftrace
-
 t_surrogatepair
 
 // this test loads a actual codepage dll (cp932.dll),  should be the last test.