diff -r 7f25ef56562d -r 29ddb8a72f0e fbs/fontandbitmapserver/group/fbservtest_helium.pkg
--- a/fbs/fontandbitmapserver/group/fbservtest_helium.pkg	Wed Jun 23 19:41:15 2010 +0300
+++ b/fbs/fontandbitmapserver/group/fbservtest_helium.pkg	Tue Jul 06 15:45:57 2010 +0300
@@ -1,5 +1,4 @@
-;
-; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ; All rights reserved.
 ; This component and the accompanying materials are made available
 ; under the terms of "Eclipse Public License v1.0"
@@ -13,10 +12,8 @@
 ;
 ; Description: 
 ;
-;File: bitgdi.pkg;
+;File: fbservtest_helium.pkg;
 ;
-;Auto-generated PKG file by Nokia PKG Wizard for CodeWarrior IDE
-
 ;*Languages
 &EN
 ;
@@ -36,149 +33,20 @@
 
 ;*Files To Copy...<src> <destination>
 
-;#include <graphics_testharness.iby>
-;#include <internaltestfonts.iby>  
-
-;// batch file that runs all automatic fbserv tests
-;data=DATAZ_\fbstest\fbstest_run.bat		\fbstest_run.bat
-;data=DATAZ_\fbstest\fbstest.bat			\fbstest.bat
-
-;//script files
-"..\tfbs\scripts\fbstest_T_Alloc.script"-"c:\fbstest\fbstest_T_Alloc.script"
-;"..\tfbs\scripts\fbstest_T_Alloc.ini"-"c:\fbstest\fbstest_T_Alloc.ini"
-"..\tfbs\scripts\fbstest_T_Bitmap.script"-"c:\fbstest\fbstest_T_Bitmap.script"
-"..\tfbs\scripts\fbstest_T_Fbs.script"-"c:\fbstest\fbstest_T_Fbs.script"
-"..\tfbs\scripts\fbstest_T_Compressed.script"-"c:\fbstest\fbstest_T_Compressed.script"
-"..\tfbs\scripts\fbstest_T_Ralc.script"-"c:\fbstest\fbstest_T_Ralc.script"
-"..\tfbs\scripts\fbstest_T_Defect.script"-"c:\fbstest\fbstest_T_Defect.script"
-"..\tfbs\scripts\fbstest_T_StreamIdCache.script"-"c:\fbstest\fbstest_T_StreamIdCache.script"
-"..\tfbs\scripts\fbstest_T_Secure.script"-"c:\fbstest\fbstest_T_Secure.script"
-"..\tfbs\scripts\fbstest_T_File.script"-"c:\fbstest\fbstest_T_File.script"
-"..\tfbs\scripts\fbstest_t_getallbitmapscapability.script"-"c:\fbstest\fbstest_t_getallbitmapscapability.script"
-"..\tfbs\scripts\fbstest_T_Clean.script"-"c:\fbstest\fbstest_T_Clean.script"
-"..\tfbs\scripts\fbstest_t_fonttable.script"-"c:\fbstest\fbstest_t_fonttable.script"
-"..\tfbs\scripts\fbstest_T_IPCTest.script"-"c:\fbstest\fbstest_T_IPCTest.script"
-"..\tfbs\scripts\ipctest_config.ini"-"c:\fbstest\ipctest_config.ini"
-"..\tfbs\scripts\fbstest_t_extendedbitmap.script"-"c:\fbstest\fbstest_t_extendedbitmap.script"
-"..\tfbs\scripts\extendedbitmap_config.ini"-"c:\fbstest\extendedbitmap_config.ini"
-"..\tfbs\scripts\fbstest_T_WDP_pagedata.script"-"c:\fbstest\fbstest_T_WDP_pagedata.script"
-"..\tfbs\scripts\fbstest_T_WDP_unpagedata.script"-"c:\fbstest\fbstest_T_WDP_unpagedata.script"
-"..\tfbs\scripts\fbstest_T_WDP_page_bitmap_data_only.script"-"c:\fbstest\fbstest_T_WDP_page_bitmap_data_only.script"
-"..\tfbs\scripts\fbstest_T_WDP_page_bitmap_data_and_shared_heap_only.script"-"c:\fbstest\fbstest_T_WDP_page_bitmap_data_and_shared_heap_only.script"
-;"..\tfbs\scripts\wdptest_config.ini"-"c:\fbstest\wdptest_config.ini"
-
-;// Fbserv WDP Alloc stress test
-"..\tfbs\scripts\fbstest_T_WDP_Alloc_Stress.script"-"c:\fbstest\fbstest_T_WDP_Alloc_Stress.script"
-;data=DATAZ_\fbstest\fbstest_T_WDP_Alloc_Stress.ini	\fbstest\fbstest_T_WDP_Alloc_Stress.ini
-
-;REM near-duplicate fonts for test  CTFnt::TestDuplicateFontFileEntries
-;data=DATAZ_\PlatTest\Graphics\TestData\uniquified_fonts\xx_dejavusanscondensed.ttf	\PlatTest\Graphics\TestData\uniquified_fonts\xx_dejavusanscondensed.ttf
-
+"\epoc32\data\z\fbstest\fbstest_T_Alloc.script"-"c:\fbstest\fbstest_T_Alloc.script"
+"\epoc32\data\z\fbstest\fbstest_T_Bitmap.script"-"c:\fbstest\fbstest_T_Bitmap.script"
+"\epoc32\data\z\fbstest\fbstest_T_Fbs.script"-"c:\fbstest\fbstest_T_Fbs.script"
+"\epoc32\data\z\fbstest\fbstest_T_Compressed.script"-"c:\fbstest\fbstest_T_Compressed.script"
+"\epoc32\data\z\fbstest\fbstest_T_Ralc.script"-"c:\fbstest\fbstest_T_Ralc.script"
+"\epoc32\data\z\fbstest\fbstest_T_Defect.script"-"c:\fbstest\fbstest_T_Defect.script"
+"\epoc32\data\z\fbstest\fbstest_T_StreamIdCache.script"-"c:\fbstest\fbstest_T_StreamIdCache.script"
+"\epoc32\data\z\fbstest\fbstest_T_Secure.script"-"c:\fbstest\fbstest_T_Secure.script"
+"\epoc32\data\z\fbstest\fbstest_T_File.script"-"c:\fbstest\fbstest_T_File.script"
+"\epoc32\data\z\fbstest\fbstest_t_getallbitmapscapability.script"-"c:\fbstest\fbstest_t_getallbitmapscapability.script"
+"\epoc32\data\z\fbstest\fbstest_T_Clean.script"-"c:\fbstest\fbstest_T_Clean.script"
+"\epoc32\data\z\fbstest\fbstest_t_fonttable.script"-"c:\fbstest\fbstest_t_fonttable.script"
+"\epoc32\data\z\fbstest\fbstest_T_IPCTest.script"-"c:\fbstest\fbstest_T_IPCTest.script"
+"\epoc32\data\z\fbstest\ipctest_config.ini"-"c:\fbstest\ipctest_config.ini"
+"\epoc32\data\z\fbstest\fbstest_t_extendedbitmap.script"-"c:\fbstest\fbstest_t_extendedbitmap.script"
+"\epoc32\data\z\fbstest\extendedbitmap_config.ini"-"c:\fbstest\extendedbitmap_config.ini"
 
-;// TFbsServer.exe needs to be copied into \sys\bin\ and set as data so it will be copied to the c: drive and we can change the capabilities of the .exe
-;data=ABI_DIR\DEBUG_DIR\TFbsServer.exe		\sys\bin\TFbsServer.exe
-;
-;data=ZSYSTEM\DATA\24bitSkin.mbm	 \System\Data\24bitSkin.mbm
-;data=ZSYSTEM\DATA\16bitSkin.mbm	 \System\Data\16bitSkin.mbm
-;data=ZSYSTEM\DATA\24bit6col.mbm	 \System\Data\24bit6col.mbm
-;data=ZSYSTEM\DATA\24bit2col.mbm	 \System\Data\24bit2col.mbm
-;data=ZSYSTEM\DATA\24bit3col.mbm	 \System\Data\24bit3col.mbm
-;data=ZSYSTEM\DATA\16bit6col.mbm	 \System\Data\16bit6col.mbm
-;data=ZSYSTEM\DATA\16bit2col.mbm	 \System\Data\16bit2col.mbm
-;data=ZSYSTEM\DATA\16bit3col.mbm	 \System\Data\16bit3col.mbm
-;data=ZSYSTEM\DATA\16bit20col.mbm \System\Data\16bit20col.mbm
-;data=ZSYSTEM\DATA\32bitSkin.mbm	 \System\Data\32bitSkin.mbm
-;data=ZSYSTEM\DATA\32bit2col.mbm	 \System\Data\32bit2col.mbm
-;data=ZSYSTEM\DATA\32bit3col.mbm	 \System\Data\32bit3col.mbm
-;data=ZSYSTEM\DATA\32bit6col.mbm	 \System\Data\32bit6col.mbm
-;data=ZSYSTEM\DATA\32bit20col.mbm \System\Data\32bit20col.mbm 
-;data=ZSYSTEM\DATA\24bit20col.mbm \System\Data\24bit20col.mbm
-;data=ZSYSTEM\DATA\tfbs.mbm	 \System\Data\tfbs.mbm
-;data=ZSYSTEM\DATA\testcompression.mbm	 \System\Data\testcompression.mbm
-;data=ZSYSTEM\DATA\tfbs.rbm	 \System\Data\tfbs.rbm
-;data=ZSYSTEM\DATA\8bitNoDither.mbm	 \System\Data\8bitNoDither.mbm
-;data=ZSYSTEM\DATA\8bitDitherFs.mbm	 \System\Data\8bitDitherFs.mbm
-;data=ZSYSTEM\DATA\12bit.mbm	 \System\Data\12bit.mbm
-;data=ZSYSTEM\DATA\16bit.mbm	 \System\Data\16bit.mbm
-;data=ZSYSTEM\DATA\24bit.mbm	 \System\Data\24bit.mbm
-;data=ZSYSTEM\DATA\32bit.mbm              \System\Data\32bit.mbm
-;data=ZSYSTEM\DATA\file.mbm	 \System\Data\file.mbm
-;data=ZSYSTEM\DATA\filecomp.mbm	 \System\Data\filecomp.mbm
-;data=ZSYSTEM\DATA\rom.mbm	 \System\Data\rom.mbm
-;data=ZSYSTEM\DATA\romcomp.mbm	 \System\Data\romcomp.mbm
-;data=ZSYSTEM\DATA\tfbs_file2.mbm	\siuhsiughighifhgidfhguifhguidhfguifhghlarglaghghghghghkrjghszkjg\system\data\tfbs_file2.mbm
-;data=ZSYSTEM\DATA\tfbs_file2.mbm	\system\data\tfbs_file2.mbm
-;data=ZSYSTEM\DATA\tfbs_file1.mbm	\siuhsiughighifhgidfhguifhguidhfguifhghlarglaghghghghghkrjghszkjg\system\data\tfbs_file1.mbm
-;data=ZSYSTEM\DATA\tfbs_file1.mbm	\system\data\tfbs_file1.mbm
-;data=ZSYSTEM\DATA\tfbs_file3.mbm	\System\Data\tfbs_file3.mbm
-;data=ZSYSTEM\DATA\tfbs_file4.mbm	\System\Data\tfbs_file4.mbm
-;data=ZSYSTEM\DATA\tfbs_file4a.mbm	\System\Data\tfbs_file4a.mbm
-;data=ZSYSTEM\DATA\tfbs_file4b.mbm	\System\Data\tfbs_file4b.mbm
-;data=ZSYSTEM\DATA\tfbs_file4c.mbm	\System\Data\tfbs_file4c.mbm
-;data=ZSYSTEM\DATA\tfbs_file4d.mbm	\System\Data\tfbs_file4d.mbm
-;data=ZSYSTEM\DATA\tfbs_file4e.mbm	\System\Data\tfbs_file4e.mbm
-;data=ZSYSTEM\DATA\tfbs_file4f.mbm	\System\Data\tfbs_file4f.mbm
-;data=ZSYSTEM\DATA\tfbs_file4g.mbm	\System\Data\tfbs_file4g.mbm
-;data=ZSYSTEM\DATA\tfbs_file4h.mbm	\System\Data\tfbs_file4h.mbm
-;data=ZSYSTEM\DATA\tfbs_file5.mbm	\System\Data\tfbs_file5.mbm
-;data=ZSYSTEM\DATA\compr12.mbm	\System\Data\compr12.mbm
-;data=ZSYSTEM\DATA\compr16.mbm	\System\Data\compr16.mbm
-;data=ZSYSTEM\DATA\compr24.mbm	\System\Data\compr24.mbm
-;data=ZSYSTEM\DATA\racompr12.mbm	\System\Data\racompr12.mbm
-;data=ZSYSTEM\DATA\racompr16.mbm	\System\Data\racompr16.mbm
-;data=ZSYSTEM\DATA\racompr24.mbm	\System\Data\racompr24.mbm
-;
-;data=ZSYSTEM\DATA\RC_ROM8.mbm           System\data\RC_ROM8.mbm
-;data=ZSYSTEM\DATA\RC_ROM12.mbm           System\data\RC_ROM12.mbm
-;data=ZSYSTEM\DATA\RC_ROM16.mbm           System\data\RC_ROM16.mbm
-;data=ZSYSTEM\DATA\RC_ROM24.mbm           System\data\RC_ROM24.mbm
-;data=ZSYSTEM\DATA\RC_RAM8.mbm           System\data\RC_RAM8.mbm
-;data=ZSYSTEM\DATA\RC_RAM12.mbm           System\data\RC_RAM12.mbm
-;data=ZSYSTEM\DATA\RC_RAM16.mbm           System\data\RC_RAM16.mbm
-;data=ZSYSTEM\DATA\RC_RAM24.mbm           System\data\RC_RAM24.mbm
-;
-;data=ZSYSTEM\DATA\MONO_M1.mbm           System\data\MONO_M1.mbm
-;data=ZSYSTEM\DATA\MONO_M2.mbm           System\data\MONO_M2.mbm
-;data=ZSYSTEM\DATA\MONO_M4.mbm           System\data\MONO_M4.mbm
-;data=ZSYSTEM\DATA\MONO_M8.mbm           System\data\MONO_M8.mbm
-;data=ZSYSTEM\DATA\MONO_C4.mbm           System\data\MONO_C4.mbm
-;data=ZSYSTEM\DATA\MONO_C8.mbm           System\data\MONO_C8.mbm
-;data=ZSYSTEM\DATA\MONO_C12.mbm           System\data\MONO_C12.mbm
-;data=ZSYSTEM\DATA\MONO_C16.mbm           System\data\MONO_C16.mbm
-;data=ZSYSTEM\DATA\MONO_C24.mbm           System\data\MONO_C24.mbm
-;data=ZSYSTEM\DATA\MONO_C32.mbm           System\data\MONO_C32.mbm
-.mbm
-;data=ZSYSTEM\DATA\MONO_C32.mbm           System\data\MONO_C32.mbm
-;
-;data=ZSYSTEM\DATA\16RAM2.mbm           System\data\16RAM2.mbm
-;data=ZSYSTEM\DATA\16ROMC2.mbm          System\data\16ROMC2.mbm
-;data=ZSYSTEM\DATA\RscHeader3.bin	System\data\RscHeader3.bin
-;data=ZSYSTEM\DATA\DummyRscFile3.rsc	System\data\DummyRscFile3.rsc
-;data=ZSYSTEM\DATA\tfbs_rsc.rsc		System\data\tfbs_rsc.rsc
-;data=ZSYSTEM\DATA\blackandwhite.mbm	System\data\blackandwhite.mbm
-;
-;data=ZSYSTEM\DATA\rf1.mbm			System\data\rf1.mbm
-;data=ZSYSTEM\DATA\rf2.mbm			System\data\rf2.mbm
-;data=ZSYSTEM\DATA\rf3.mbm			System\data\rf3.mbm
-;data=ZSYSTEM\DATA\rf123.mbm			System\data\rf123.mbm
-;
-;data=ZSYSTEM\DATA\00_grbmap.mbm			 \System\Data\00_grbmap.mbm
-;data=ZSYSTEM\DATA\01_totalstramsize!.mbm	 \System\Data\01_totalstramsize!.mbm
-;data=ZSYSTEM\DATA\02_headersize.mbm	 	 \System\Data\02_headersize.mbm
-;data=ZSYSTEM\DATA\03_width!.mbm	 		 \System\Data\03_width!.mbm
-;data=ZSYSTEM\DATA\04_height!.mbm		 \System\Data\04_height!.mbm
-;data=ZSYSTEM\DATA\05_bitsperpixel.mbm	 	 \System\Data\05_bitsperpixel.mbm
-;data=ZSYSTEM\DATA\bad_bmpsize.mbm	 	 \System\Data\bad_bmpsize.mbm
-;data=ZSYSTEM\DATA\bad_colormode.mbm	 	 \System\Data\bad_colormode.mbm
-;data=ZSYSTEM\DATA\bad_compression.mbm		 \System\Data\bad_compression.mbm
-;data=ZSYSTEM\DATA\bad_paletteentries.mbm	 \System\Data\bad_paletteentries.mbm
-;data=EPOCROOT##epoc32\data\z\PRIVATE\10273364\RC_RAM16.mbm	\private\10273364\RC_RAM16.mbm
-;data=EPOCROOT##epoc32\data\z\PRIVATE\10273364\RC_ROM12.mbm	\private\10273364\RC_ROM12.mbm	
-;data=EPOCROOT##epoc32\data\z\PRIVATE\10273364\TFBS_RSC.rsc	\private\10273364\TFBS_RSC.rsc
-;data=EPOCROOT##epoc32\data\z\PRIVATE\10273364\DummyRscFile3.rsc	\private\10273364\DummyRscFile3.rsc
-;data=EPOCROOT##epoc32\data\z\PRIVATE\10273364\RscHeader3.bin	\private\10273364\RscHeader3.bin
-;data=EPOCROOT##epoc32\data\z\PRIVATE\00999999\RC_RAM16.mbm	\private\00999999\RC_RAM16.mbm
-;data=EPOCROOT##epoc32\data\z\PRIVATE\00999999\RC_ROM12.mbm	\private\00999999\RC_ROM12.mbm	
-;
-;
-;#endif