diff -r 601ab138ba0b -r a7c938434754 textrendering/textformatting/group/bld.inf
--- a/textrendering/textformatting/group/bld.inf	Tue Jul 06 16:23:19 2010 +0300
+++ b/textrendering/textformatting/group/bld.inf	Wed Aug 18 11:34:25 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1999-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"
@@ -67,10 +67,32 @@
 PRJ_TESTEXPORTS
 
 // batch file that runs all automatic charconv tests on hardware
-../group/FormTests.bat		/epoc32/data/z/system/test/formtests.bat
+../test/scripts/formtests_run.bat z:/test/app-framework/form/formtests_run.bat
+../test/scripts/formtests_run.bat /epoc32/release/winscw/urel/formtests_run.bat
+../test/scripts/formtests_run.bat /epoc32/release/winscw/udeb/formtests_run.bat
+
+../test/scripts/formtests.bat z:/test/app-framework/form/formtests.bat
+
 ../group/FormTests.iby		/epoc32/rom/include/formtests.iby
 ../group/formTechviewRTests.iby /epoc32/rom/include/formtechviewrtests.iby
 
+//script
+../test/scripts/form_t_all.script z:/test/app-framework/form/form_t_all.script
+../test/scripts/form_t_customcharmapping.script z:/test/app-framework/form/form_t_customcharmapping.script
+../test/scripts/form_t_tagmaimp.script z:/test/app-framework/form/form_t_tagmaimp.script
+../test/scripts/form_t_tmsouce.script z:/test/app-framework/form/form_t_tmsource.script
+../test/scripts/form_t_bidicursorpos.script z:/test/app-framework/form/form_t_bidicursorpos.script
+../test/scripts/form_t_tmcode.script z:/test/app-framework/form/form_t_tmcode.script
+../test/scripts/form_t_unique.script z:/test/app-framework/form/form_t_unique.script
+../test/scripts/form_t_undo.script z:/test/app-framework/form/form_t_undo.script
+../test/scripts/form_t_interpreter.script z:/test/app-framework/form/form_t_interpreter.script
+../test/scripts/form_t_format.script z:/test/app-framework/form/form_t_format.script
+../test/scripts/form_t_inlinetext.script z:/test/app-framework/form/form_t_inlinetext.script
+../test/scripts/form_t_graphemeiterator.script z:/test/app-framework/form/form_t_graphemeiterator.script
+../test/scripts/form_t_formbenchmark.script z:/test/app-framework/form/form_t_formbenchmark.script
+../test/scripts/form_t_linepag.script z:/test/app-framework/form/form_t_linepag.script
+../test/scripts/form_t_formhindi.script z:/test/app-framework/form/form_t_formhindi.script
+
 // Bitmap data
 ../test/data/dilbert.mbm z:/system/data/ttreddilbert.mbm
 ../test/data/data.mbm z:/system/data/ttreddata.mbm
@@ -96,28 +118,15 @@
 ../group/Undo.mmp
 
 PRJ_TESTMMPFILES
+../test/group/tformserver.mmp
 
 #ifndef WINC
 ../test/group/TBitmapDoc.mmp	support		// DLL
 ../test/group/TTAGMA.MMP	manual		// Needs to run in full EPOC.EXE environment & requires manual intervention
-../test/group/TLINEPAG.MMP
 ../test/group/TTextView.mmp	manual		// Needs to run in full EPOC.EXE environment
 ../test/group/TTextView2.mmp manual		// Needs to run in full EPOC.EXE environment
-../test/group/TInlineText.mmp
-../test/group/TCustomCharMapping.mmp
-../test/group/TTagmaImp.mmp
-../test/group/TGraphemeIterator.mmp	
 ../test/group/TCustomWrap.mmp	support		// APP
-../test/group/TTmSource.mmp
-../test/group/TBidiCursorPos.mmp
-../test/group/TTmCode.mmp
-../test/group/TUnique.mmp
-../test/group/TUndo.mmp
-../test/group/TInterpreter.mmp
-../test/group/TFormat.mmp
 ../test/group/TTranspEditor.mmp	support		// App
-../test/group/TFormBenchmark.mmp
-../test/group/tformhindi.mmp
 ../test/group/TForm18030.mmp	manual
 #endif
 
@@ -125,4 +134,3 @@
 //BAND FORMAT TESTS
 #include "../test/tbandformat/group/bld.inf"
 
-