diff -r d8d70de2bd36 -r 57b9594f5772 kerneltest/e32test/group/bld.inf
--- a/kerneltest/e32test/group/bld.inf	Wed Aug 18 11:08:29 2010 +0300
+++ b/kerneltest/e32test/group/bld.inf	Thu Sep 02 21:54:16 2010 +0300
@@ -31,21 +31,21 @@
 
 PRJ_TESTEXPORTS
 
-../../../kernel/eka/include/kernel/dobject.h						/epoc32/include/kernel/			
+../../../kernel/eka/include/kernel/dobject.h						OS_LAYER_PLATFORM_EXPORT_PATH(kernel/dobject.h)			
 
-../../../userlibandfileserver/domainmgr/inc/domainobserver.h				/epoc32/include/
+../../../userlibandfileserver/domainmgr/inc/domainobserver.h				OS_LAYER_PLATFORM_EXPORT_PATH(domainobserver.h)
 
-../dll/d_ldrtst.h					/epoc32/include/
+../dll/d_ldrtst.h					OS_LAYER_PLATFORM_EXPORT_PATH(d_ldrtst.h)
 
-../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)	//
+../nkernsa/interrupts.h				OS_LAYER_PLATFORM_EXPORT_PATH(nktest/interrupts.h)	//
+../nkernsa/nkutils.h				OS_LAYER_PLATFORM_EXPORT_PATH(nktest/nkutils.h)	//
+../nkernsa/utils.h					OS_LAYER_PLATFORM_EXPORT_PATH(nktest/utils.h)	//
+../nkernsa/diag.h					OS_LAYER_PLATFORM_EXPORT_PATH(nktest/diag.h)	//
 
-../../../kernel/eka/include/e32huffman.h				/epoc32/include/
+../../../kernel/eka/include/e32huffman.h				OS_LAYER_PLATFORM_EXPORT_PATH(e32huffman.h)
 
 platsec.settings        /epoc32/data/defaulttest.ini
-../mmu/d_memorytest.h   /epoc32/include/e32test/d_memorytest.h
+../mmu/d_memorytest.h   OS_LAYER_PLATFORM_EXPORT_PATH(e32test/d_memorytest.h)
 
 ../buffer/UnicodeData.txt    /epoc32/data/z/test/unicodedata.txt
 ../buffer/UnicodeData.txt    /epoc32/release/wins/udeb/z/test/unicodedata.txt
@@ -68,11 +68,10 @@
 ../dll/oe/eabi/urel/t_oeexport.exe      /epoc32/release/armv5/urel/t_oeexport.exe
 ../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
+../demandpaging/d_pagestress.h		OS_LAYER_PLATFORM_EXPORT_PATH(d_pagestress.h)
 
-../iic/iic_psl/i2c.h			/epoc32/include/e32test/
-../iic/iic_psl/spi.h			/epoc32/include/e32test/
+../iic/iic_psl/i2c.h			OS_LAYER_PLATFORM_EXPORT_PATH(e32test/i2c.h)
+../iic/iic_psl/spi.h			OS_LAYER_PLATFORM_EXPORT_PATH(e32test/spi.h)
 
 PRJ_TESTMMPFILES
 
@@ -93,6 +92,9 @@
 d_ldd2_ram					support
 d_lddns						support
 d_lddpowerseqtest			support
+#if !defined(X86) && !defined(WINS)
+../power/d_powermisctest					support
+#endif
 d_ldddigitisertest			support
 d_lddturnaroundtimertest	support
 d_newldd					support
@@ -257,6 +259,9 @@
 t_ramdefrag
 #endif
 
+// /E32TEST/TIMESTAMP test must also come before t_lat2 as it goes into Low Power Mode.
+t_timestamp
+
 #ifdef EPOC32
 // Start the latency measurement
 t_lat2
@@ -311,9 +316,6 @@
 t_userasmbm manual
 #endif
 
-// /E32TEST/TIMESTAMP test
-t_timestamp
-
 // /e32test/benchmark
 #ifndef X86
 bm_suite    MANUAL_ON_WINS
@@ -402,6 +404,9 @@
 t_tldd
 t_newldd
 t_lddpowerseqtest
+#if !defined(X86) && !defined(WINS)
+../power/t_powermisctest 
+#endif
 t_ldddigitisertest
 t_userdigitisertest
 t_userdigitisernocaps
@@ -721,9 +726,6 @@
 // /E32TEST/POWER tests
 t_power
 t_power_slave   support
-t_domain
-t_domain_slave  support
-domainPolicyTest support
 t_switchoff
 t_frqchg
 
@@ -1022,37 +1024,7 @@
 #endif
 
 #if defined(MARM_ARMV5)
-../rm_debug/group/t_rmdebug_dll support
-../rm_debug/group/t_rmdebug_security0 support
-../rm_debug/group/t_rmdebug_security1 support
-../rm_debug/group/t_rmdebug_security2 support
-../rm_debug/group/t_rmdebug_security3 support
-../rm_debug/group/t_rmdebug_app support
-../rm_debug/group/t_rmdebug2
-../rm_debug/group/t_rmdebug2_oem
-../rm_debug/group/t_rmdebug2_oemtoken support
-../rm_debug/group/t_rmdebug2_oem2
-../rm_debug/group/t_rmdebug2_oemtoken2 support
 ../rm_debug/group/t_crashmonitor_lib
-
-../rm_debug/group/t_rmdebug_app1 support
-../rm_debug/group/t_rmdebug_app2 support
-../rm_debug/group/t_rmdebug_app3 support
-../rm_debug/group/t_rmdebug_app4 support
-../rm_debug/group/t_rmdebug_app5 support
-../rm_debug/group/t_rmdebug_app6 support
-../rm_debug/group/t_rmdebug_app7 support
-../rm_debug/group/t_rmdebug_app8 support
-../rm_debug/group/t_rmdebug_app9 support
-../rm_debug/group/t_rmdebug_app10 support
-
-../rm_debug/group/t_rmdebug_target_launcher support
-../rm_debug/group/t_rmdebug_multi_target
-
-../rm_debug/group/t_rmdebug_multi_agent support
-../rm_debug/group/t_multi_agent_launcher
-
-
 #endif
 
 t_stacksize
@@ -1080,6 +1052,5 @@
 
 #include "../hcr/hcr.inf"
 
-//pci tests
-t_pci
+#include "../domainmgr/test.inf"