--- a/kerneltest/e32test/group/bld.inf	Tue Feb 02 01:24:03 2010 +0200
+++ b/kerneltest/e32test/group/bld.inf	Sat Feb 20 00:10:51 2010 +0200
@@ -37,10 +37,10 @@
 
 ../dll/d_ldrtst.h					/epoc32/include/
 
-../nkernsa/interrupts.h				/epoc32/include/nktest/	//
-../nkernsa/nkutils.h				/epoc32/include/nktest/	//
-../nkernsa/utils.h					/epoc32/include/nktest/	//
-../nkernsa/diag.h					/epoc32/include/nktest/	//
+../nkernsa/interrupts.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(nktest/interrupts.h)	//
+../nkernsa/nkutils.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(nktest/nkutils.h)	//
+../nkernsa/utils.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(nktest/utils.h)	//
+../nkernsa/diag.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(nktest/diag.h)	//
 
 ../../../kernel/eka/include/e32huffman.h				/epoc32/include/
 
@@ -69,6 +69,7 @@
 ../dll/oe/eabi/urel/t_oeexport1.exe     /epoc32/release/armv5/urel/t_oeexport1.exe
 
 ../demandpaging/d_pagestress.h		/epoc32/include/
+../pci/t_pci.h						/epoc32/include/e32test/t_pci.h
 
 ../iic/iic_psl/i2c.h			/epoc32/include/e32test/
 ../iic/iic_psl/spi.h			/epoc32/include/e32test/
@@ -117,6 +118,7 @@
 d_shbuf_client				support
 d_shbuf_own					support
 d_asid						support
+d_entropysources			support
 
 #ifdef GENERIC_MARM
 d_schedhook					support
@@ -482,6 +484,11 @@
 t_heapdb
 t_kheap
 
+// Secure RNG tests
+t_securerng
+t_sha256
+t_entropysources
+
 // /E32TEST/LFFS tests
 t_lfsdrv2       manual
 t_lfsdrvbm		manual
@@ -999,3 +1006,6 @@
 d_mmcsc			support
 
 #include "../hcr/hcr.inf"
+
+//pci tests
+t_pci