diff -r 7333d7932ef7 -r 8b7f4e561641 installationservices/swi/test/tdaemon/scripts/tdaemon.ini --- a/installationservices/swi/test/tdaemon/scripts/tdaemon.ini Tue Aug 31 15:21:33 2010 +0300 +++ b/installationservices/swi/test/tdaemon/scripts/tdaemon.ini Wed Sep 01 12:22:02 2010 +0100 @@ -2,12 +2,6 @@ [Daemon] -[AddDriveX] -drive=X - -[AddDriveT] -drive=T - [InstallSA_on_emmc] sis=z:\tswi\tsis\data\emmc_format_base_on_emmc.sis script=z:\tswi\tuiscriptadaptors\scripts\simple.xml @@ -65,133 +59,80 @@ uid =8000887D script=z:\tswi\tuiscriptadaptors\scripts\uninstall.xml -[CheckX] -NoOfComponents=0 -FormatDrive=X - -[CheckT] -NoOfComponents=0 -FormatDrive=T - -[Check_component_exists_for_SA_after_emmc_format_case1] -ComponentName=emmc_format_base_on_emmc -VendorName=Vendor -NoOfComponents=0 - [Check_files_exists_for_SA_after_emmc_format] -numnonexist = 6 +numnonexist = 7 nonexist0 = c:\sys\bin\runtestexe_app.exe nonexist1 = c:\sys\bin\console_app.exe nonexist2 = x:\dummy.txt -nonexist3 = C:\sys\install\sisregistry\8000887d\00000000_0000.ctl -nonexist4 = C:\sys\hash\runtestexe_app.exe -nonexist5 = C:\sys\hash\console_app.exe +nonexist3 = C:\sys\install\sisregistry\8000887d\00000000.reg +nonexist4 = C:\sys\install\sisregistry\8000887d\00000000_0000.ctl +nonexist5 = C:\sys\hash\runtestexe_app.exe +nonexist6 = C:\sys\hash\console_app.exe [Check_files_exists_for_SA_after_T_dive_format] -numexist = 6 +numexist = 7 exist0 = c:\sys\bin\runtestexe_app.exe exist1 = c:\sys\bin\console_app.exe exist2 = x:\dummy.txt -exist3 = C:\sys\install\sisregistry\8000887d\00000000_0000.ctl -exist4 = C:\sys\hash\runtestexe_app.exe -exist5 = C:\sys\hash\console_app.exe - -[Check_component_exists_for_SP_after_emmc_format_case2] -ComponentName=emmc_format_base_on_c_drive -VendorName=Vendor -NoOfComponents=1 +exist3 = C:\sys\install\sisregistry\8000887d\00000000.reg +exist4 = C:\sys\install\sisregistry\8000887d\00000000_0000.ctl +exist5 = C:\sys\hash\runtestexe_app.exe +exist6 = C:\sys\hash\console_app.exe -[Check_component_exists_for_SP_after_emmc_format_case3] -ComponentName=emmc_format_base_on_c_drive -VendorName=Vendor -NoOfComponents=0 - -[Check_component_exists_for_SA_after_emmc_format_3] -ComponentName=emmc_format_base_on_emmc -VendorName=Vendor -NoOfComponents=1 [Check_files_exists_for_SP_after_emmc_format] -numnonexist=4 +numnonexist=5 nonexist0 = c:\sys\bin\console_app2.exe nonexist1 = x:\dummy.txt -nonexist2 = C:\sys\install\sisregistry\8000887d\00000001_0000.ctl -nonexist3 = C:\sys\hash\console_app2.exe +nonexist2 = C:\sys\install\sisregistry\8000887d\00000001.reg +nonexist3 = C:\sys\install\sisregistry\8000887d\00000001_0000.ctl +nonexist4 = C:\sys\hash\console_app2.exe [Check_files_exists_for_Two_SP_after_emmc_format] -numnonexist = 5 +numnonexist = 6 nonexist0 = c:\sys\bin\console_app2.exe nonexist1 = x:\dummy.txt nonexist2 = x:\dummy1.txt -nonexist3 = C:\sys\install\sisregistry\8000887d\00000001_0000.ctl -nonexist4 = C:\sys\hash\console_app2.exe +nonexist3 = C:\sys\install\sisregistry\8000887d\00000001.reg +nonexist4 = C:\sys\install\sisregistry\8000887d\00000001_0000.ctl +nonexist5 = C:\sys\hash\console_app2.exe [Check_marker_files] numnonexist = 2 nonexist0 = c:\private\102020DCE\firstbootmarkernonexistforx nonexist1 = x:\sys\install\formatmarker - -[Check_component_exists_for_SASP_after_emmc_format] -ComponentName=emmc_format_sp_on_c -VendorName=Vendor -NoOfComponents=1 - [Check_files_exists_for_SASP_after_emmc_format] -numnonexist = 9 +numnonexist = 11 nonexist0 = c:\sys\bin\runtestexe_app.exe nonexist1 = c:\sys\bin\console_app.exe nonexist2 = x:\dummy.txt -nonexist3 = C:\sys\install\sisregistry\8000887d\00000000_0000.ctl -nonexist4 = C:\sys\hash\runtestexe_app.exe -nonexist5 = C:\sys\hash\console_app.exe -nonexist6 = c:\sys\bin\console_app2.exe -nonexist7 = C:\sys\install\sisregistry\8000887d\00000001_0000.ctl -nonexist8 = C:\sys\hash\console_app2.exe - -//case7 -[Check_component_exists_for_SA_on_C_and_T_after_emmc_format] -ComponentName=emmc_format_base_on_c_and_t -VendorName=Vendor -NoOfComponents=1 - -//case8 -[Check_component_exists_for_SA_on_C_E_and_T_after_emmc_format] -ComponentName=emmc_format_base_distributed -VendorName=Vendor -NoOfComponents=0 - -//case9 -[Check_component_exists_for_SA_on_C_E_and_T_after_emmc_format_case9] -ComponentName=emmc_format_base_distributed -VendorName=Vendor -NoOfComponents=0 - -[Check_component_exists_for_SA_on_C_E_and_T_after_emmc_format] -ComponentName=emmc_format_base_distributed -VendorName=Vendor -NoOfComponents=0 - -[Check_component_exists_for_SA_on_C_and_T_after_emmc_format??] -ComponentName=emmc_format_base_on_c_and_t_NR -VendorName=Vendor -NoOfComponents=1 +nonexist3 = C:\sys\install\sisregistry\8000887d\00000000.reg +nonexist4 = C:\sys\install\sisregistry\8000887d\00000000_0000.ctl +nonexist5 = C:\sys\hash\runtestexe_app.exe +nonexist6 = C:\sys\hash\console_app.exe +nonexist7 = c:\sys\bin\console_app2.exe +nonexist8 = C:\sys\install\sisregistry\8000887d\00000001.reg +nonexist9 = C:\sys\install\sisregistry\8000887d\00000001_0000.ctl +nonexist10 = C:\sys\hash\console_app2.exe [Check_files_exists_for_SA_on_C_and_T_after_emmc_format] -numexist = 6 +numexist = 7 exist0 = c:\sys\bin\runtestexe_app.exe exist1 = c:\sys\bin\console_app.exe exist2 = T:\dummy1.txt -exist3 = C:\sys\install\sisregistry\8000887d\00000000_0000.ctl -exist4 = C:\sys\hash\runtestexe_app.exe -exist5 = C:\sys\hash\console_app.exe +exist3 = C:\sys\install\sisregistry\8000887d\00000000.reg +exist4 = C:\sys\install\sisregistry\8000887d\00000000_0000.ctl +exist5 = C:\sys\hash\runtestexe_app.exe +exist6 = C:\sys\hash\console_app.exe [Check_files_exists_for_SA_on_C_E_and_T_after_emmc_format] -numnonexist = 7 +numnonexist = 8 nonexist0 = c:\sys\bin\runtestexe_app.exe nonexist1 = c:\sys\bin\console_app.exe nonexist2 = x:\dummy.txt -nonexist3 = C:\sys\install\sisregistry\8000887d\00000000_0000.ctl -nonexist4 = C:\sys\hash\runtestexe_app.exe -nonexist5 = C:\sys\hash\console_app.exe -nonexist6 = T:\dummy1.txt +nonexist3 = C:\sys\install\sisregistry\8000887d\00000000.reg +nonexist4 = C:\sys\install\sisregistry\8000887d\00000000_0000.ctl +nonexist5 = C:\sys\hash\runtestexe_app.exe +nonexist6 = C:\sys\hash\console_app.exe +nonexist7 = T:\dummy1.txt