diff -r 000000000000 -r ba25891c3a9e installationservices/swi/test/tuiscriptadaptors/scripts/tcleanupinfrastructure_legacy.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/installationservices/swi/test/tuiscriptadaptors/scripts/tcleanupinfrastructure_legacy.ini	Thu Dec 17 08:51:10 2009 +0200
@@ -0,0 +1,336 @@
+[augmentation_base_x]
+sis=z:\tswi\tsis\data\testaugmentations_base.sis
+script=z:\tswi\tuiscriptadaptors\scripts\Simple_drive_x.xml
+numexist=7
+exist0=x:\Documents\InstTest\abase1.txt
+exist1=x:\Documents\InstTest\abase4.txt
+exist2=c:\sys\uninstall\81111207_00000000\x
+exist3=x:\sys\uninstall\81111207_00000000\x
+exist4=c:\sys\install\sisregistry\81111207\00000000_0000.ctl
+exist5=x:\sys\install\sisregistry\81111207\00000000_0000.ctl
+exist6=c:\sys\install\sisregistry\81111207\00000000.reg
+
+
+[augmentation_aug_x]
+sis=z:\tswi\tsis\data\testaugmentations_A.sis
+script=z:\tswi\tuiscriptadaptors\scripts\Simple_drive_x.xml
+numexist=4
+exist0=x:\Documents\InstTest\abase1.txt
+exist1=x:\Documents\InstTest\abase4.txt
+exist2=x:\Documents\InstTest\aA1.txt
+exist3=x:\Documents\InstTest\clashing.txt
+
+[u_augmentation_aug_x]
+uid=81111207
+vendorName=Unique Vendor Name
+packageName=Augmentations_A
+script=z:\tswi\tuiscriptadaptors\scripts\uninstall.xml
+nonexist=2
+nonexist0=x:\Documents\InstTest\aA1.txt
+nonexist1=x:\Documents\InstTest\clashing.txt
+
+[u_augmentation_base_x]
+uid=81111207
+script=z:\tswi\tuiscriptadaptors\scripts\uninstall.xml
+numnonexist=9
+nonexist0=x:\Documents\InstTest\abase1.txt
+nonexist1=x:\Documents\InstTest\abase4.txt
+nonexist2=x:\Documents\InstTest\aA1.txt
+nonexist3=x:\Documents\InstTest\clashing.txt
+nonexist4=c:\sys\uninstall\81111207_00000000\x
+nonexist5=x:\sys\uninstall\81111207_00000000\x
+nonexist6=c:\sys\install\sisregistry\81111207\00000000_0000.ctl
+nonexist7=x:\sys\install\sisregistry\81111207\00000000_0000.ctl
+nonexist8=c:\sys\install\sisregistry\81111207\00000000.reg
+
+[u_augmentation_base_x_unmounted]
+uid=81111207
+script=z:\tswi\tuiscriptadaptors\scripts\uninstall.xml
+numnonexist=4
+nonexist0=x:\Documents\InstTest\abase1.txt
+nonexist1=x:\Documents\InstTest\abase4.txt
+nonexist2=c:\sys\install\sisregistry\81111207\00000000_0000.ctl
+nonexist3=c:\sys\install\sisregistry\81111207\00000000.reg
+numexist=1
+exist0=c:\sys\uninstall\81111207_00000000\x
+
+[test2drives_x]
+sis=z:\tswi\tsis\data\test2drives.sis
+script=z:\tswi\tuiscriptadaptors\scripts\Simple_drive_x.xml
+numexist=3
+exist0=C:\Documents\InstTest\file1.txt
+exist1=E:\Documents\InstTest\file2.txt
+exist2=X:\Documents\InstTest\file3.txt
+
+[u_test2drives_x]
+uid=80000009
+script=z:\tswi\tuiscriptadaptors\scripts\uninstall.xml
+numnonexist=3
+nonexist0=C:\Documents\InstTest\file1.txt
+nonexist1=E:\Documents\InstTest\file2.txt
+nonexist2=X:\Documents\InstTest\file3.txt
+
+[partialupgrade_base]
+sis=z:\tswi\tsis\data\testupgrade_base.sis
+script=z:\tswi\tuiscriptadaptors\scripts\Simple_drive_x.xml
+numexist=3
+exist0=X:\Documents\InstTest\upgrade1.txt
+exist1=X:\Documents\InstTest\upgrade2.txt
+exist2=X:\Documents\InstTest\upgrade3.txt
+
+[partialupgrade_upgrade]
+sis=z:\tswi\tsis\data\testupgrade_partial.sis
+script=z:\tswi\tuiscriptadaptors\scripts\Simple_drive_x.xml
+numexist=4
+exist0=X:\Documents\InstTest\upgrade1.txt
+exist1=X:\Documents\InstTest\upgrade2.txt
+exist2=X:\Documents\InstTest\upgrade3.txt
+exist3=X:\Documents\InstTest\upgrade4.txt
+
+[u_partialupgrade]
+uid=811111FD
+script=z:\tswi\tuiscriptadaptors\scripts\uninstall.xml
+numnonexist=4
+nonexist0=X:\Documents\InstTest\upgrade1.txt
+nonexist1=X:\Documents\InstTest\upgrade2.txt
+nonexist2=X:\Documents\InstTest\upgrade3.txt
+nonexist3=X:\Documents\InstTest\upgrade4.txt
+
+[simple]
+sis=z:\tswi\tsis\data\simple.sis
+uid=80000001
+script=z:\tswi\tuiscriptadaptors\scripts\Simple_drive_x.xml
+drivechar=X
+numexist=1
+exist0=X:\Documents\InstTest\file1.txt
+
+[simple_present]
+uid=80000001
+expectpresent=true
+
+[simple_absent]
+uid=80000001
+expectpresent=false
+
+[simple_uninstalled]
+uid=80000001
+expectinstalled=false
+
+[u_simple]
+uid=80000001
+script=z:\tswi\tuiscriptadaptors\scripts\uninstall.xml
+numnonexist=1
+nonexist0=X:\Documents\InstTest\file1.txt
+
+
+[basepkg]
+sis=z:\tswi\tsis\data\testupgrade_base.sis
+script=z:\tswi\tuiscriptadaptors\scripts\Simple.xml
+numexist=3
+exist0=c:\Documents\InstTest\upgrade1.txt
+exist1=c:\Documents\InstTest\upgrade2.txt
+exist2=c:\Documents\InstTest\upgrade3.txt
+
+[basepkg2]
+sis=z:\tswi\tsis\data\testupgrade_basediffname.sis
+script=z:\tswi\tuiscriptadaptors\scripts\Simple_drive_x.xml
+numexist=3
+exist0=x:\Documents\InstTest\upgrade1.txt
+exist1=x:\Documents\InstTest\upgrade2.txt
+exist2=x:\Documents\InstTest\upgrade3.txt
+
+
+[u_basepkg]
+uid=811111FD
+script=z:\tswi\tuiscriptadaptors\scripts\uninstall.xml
+numnonexist=6
+nonexist0=c:\Documents\InstTest\upgrade1.txt
+nonexist1=c:\Documents\InstTest\upgrade2.txt
+nonexist2=c:\Documents\InstTest\upgrade3.txt
+nonexist3=x:\Documents\InstTest\upgrade1.txt
+nonexist4=x:\Documents\InstTest\upgrade2.txt
+nonexist5=x:\Documents\InstTest\upgrade3.txt
+
+ 
+[filenullmmc]
+sis=z:\tswi\tsis\data\filenullmmc.sis
+script=z:\tswi\tuiscriptadaptors\scripts\simple.xml
+numexist=2
+exist0=c:\sys\bin\createprivatefile.exe
+exist1=c:\private\81000013\helloworld.txt
+uid=81000008
+expectpresent=true
+
+ 
+[filenullmmc_copyfiles]
+copynum=3
+copyfrom0=c:\private\81000013\helloworld.txt
+copyto0=x:\private\81000013\xhelloworld.txt
+copyfrom1=c:\private\81000013\helloworld.txt
+copyto1=c:\Documents\InstTest\cfiletoremove.txt
+copyfrom2=c:\private\81000013\helloworld.txt
+copyto2=x:\Documents\InstTest\xfiletoremove.txt
+ 
+[filenullmmc_checkfiles]
+numexist=5
+exist0=c:\Documents\InstTest\cfiletoremove.txt
+exist1=x:\Documents\InstTest\xfiletoremove.txt
+exist2=c:\sys\bin\createprivatefile.exe
+exist3=c:\private\81000013\helloworld.txt
+exist4=x:\private\81000013\xhelloworld.txt
+ 
+[u_filenullmmc]
+uid=81000008
+script=z:\tswi\tuiscriptadaptors\scripts\uninstall.xml
+numnonexist=5
+nonexist0=c:\Documents\InstTest\cfiletoremove.txt
+nonexist1=x:\Documents\InstTest\xfiletoremove.txt
+nonexist2=c:\sys\bin\createprivatefile.exe
+nonexist3=c:\private\81000013\helloworld.txt
+nonexist4=x:\private\81000013\xhelloworld.txt
+
+[fileinsisregistrydir]
+copynum=1
+copyfrom0=z:\tswi\tuiscriptadaptors\scripts\simple.xml
+copyto0=x:\sys\install\sisregistry\00000000
+deletenum=1
+deletefile0=x:\sys\install\sisregistry\00000000
+
+[Install_DEF076676]
+sis=z:\tswi\tsis\data\testaugmentations_base.sis
+script=z:\tswi\tuiscriptadaptors\scripts\Simple_drive_x.xml
+numexist=1
+exist0=c:\sys\install\sisregistry\81111207\
+
+[u_DEF076676_x]
+uid=81111207
+script=z:\tswi\tuiscriptadaptors\scripts\uninstall.xml
+numnonexist=1
+nonexist0=c:\sys\install\sisregistry\81111207\
+numexist=1
+exist0=c:\sys\uninstall\81111207_00000000\
+
+[u_DEF076676]
+uid=81111207
+script=z:\tswi\tuiscriptadaptors\scripts\uninstall.xml
+numnonexist=2
+nonexist0=c:\sys\uninstall\81111207_00000000\
+nonexist1=c:\sys\install\sisregistry\81111207\ 
+
+[MmcReg]
+deletenum=2
+deletefile0=x:\sys\install\sisregistry
+deletefile1=c:\sys\install\sisregistry\backup.lst
+deleteignoreerrors=true
+
+copynum=1
+copyfrom0=z:\tswi\tuiscriptadaptors\scripts\simple.xml
+copyto0=x:\sys\install\sisregistry
+
+[esock]
+uid=101f7989
+
+[orphancleanuptestsetup]
+copynum=4
+copyto0=x:\sys\install\sisregistry\e0000019\00000000_0000.ctl
+copyfrom0=z:\tswi\DEF053165.perm
+copyto1=c:\sys\uninstall\e0000019_00000000\x\fakelog.log
+copyfrom1=z:\tswi\DEF053165.perm
+copyto2=x:\sys\uninstall\e0000019_00000000\x\fakelog.log
+copyfrom2=z:\tswi\DEF053165.perm
+copyto3=c:\sys\install\sisregistry\e0000019\00000000_0000.ctl
+copyfrom3=z:\tswi\DEF053165.perm
+
+
+[orphansurvivesrollback]
+sis=z:\tswi\tsis\data\embedszerosbadprivatedir.sis
+script=z:\tswi\tuiscriptadaptors\scripts\simple_drive_x.xml
+watchfilename=x:\sys\uninstall\e0000019_00000000\x\fakelog.log
+expectfilechange=true
+expectedresult1=-21
+comparefilea1=x:\sys\install\sisregistry\e0000019\00000000_0000.ctl
+comparefileb1=z:\tswi\DEF053165.perm
+comparefilea2=c:\sys\uninstall\e0000019_00000000\x\fakelog.log
+comparefileb2=z:\tswi\DEF053165.perm
+comparefilea3=x:\sys\uninstall\e0000019_00000000\x\fakelog.log
+comparefileb3=z:\tswi\DEF053165.perm
+comparefilea4=c:\sys\install\sisregistry\e0000019\00000000_0000.ctl
+comparefileb4=z:\tswi\DEF053165.perm
+
+[orphansnotcreated]
+sis=z:\tswi\tsis\data\embedszerosbadprivatedir.sis
+script=z:\tswi\tuiscriptadaptors\scripts\simple_drive_x.xml
+expectedresult1=-21
+numnonexist=5
+nonexist0=x:\sys\install\sisregistry\e0000019
+nonexist1=c:\sys\uninstall\e0000019_00000000\c
+nonexist2=c:\sys\uninstall\e0000019_00000000\x
+nonexist3=x:\sys\uninstall\e0000019_00000000\x
+nonexist4=c:\sys\install\sisregistry\e0000019
+
+[zeros]
+sis=z:\tswi\tsis\data\zeros.sis
+script=z:\tswi\tuiscriptadaptors\scripts\simple_drive_x.xml
+numexist=3
+exist0=x:\sys\install\sisregistry\e0000019
+exist1=c:\sys\uninstall\e0000019_00000000\x
+exist2=x:\sys\uninstall\e0000019_00000000\x
+numnonexist=3
+nonexist0=c:\sys\uninstall\e0000019_00000000\x\fakelog.log
+nonexist1=x:\sys\uninstall\e0000019_00000000\x\fakelog.log
+nonexist2=c:\sys\uninstall\e0000019_00000000\c
+
+[u_zeros]
+uid=e0000019
+script=z:\tswi\tuiscriptadaptors\scripts\uninstall.xml
+numnonexist=4
+nonexist0=x:\sys\install\sisregistry\e0000019
+nonexist1=c:\sys\uninstall\e0000019_00000000
+nonexist2=x:\sys\uninstall\e0000019_00000000
+nonexist3=c:\sys\install\sisregistry\e0000019
+
+[stubprivateupgradesp]
+sis=z:\tswi\tsis\data\stubprivatesidwildcardsp_Root5CA.sis
+script=z:\tswi\tuiscriptadaptors\scripts\simple_drive_x.xml
+numexist=5
+exist0=x:\private\10273581\test.txt
+exist1=c:\sys\install\sisregistry\802730A1\00000001_0000.ctl
+exist2=x:\sys\install\sisregistry\802730A1\00000001_0000.ctl
+exist3=c:\sys\uninstall\802730A1_00000001\x
+exist4=x:\sys\uninstall\802730A1_00000001\x
+numnonexist=1
+nonexist0=c:\sys\uninstall\802730A1_00000001\c
+
+[u_stubprivateupgradesp]
+uid=802730A1
+vendorName=Crypto Services
+packageName=Private SID upgrade SP
+script=z:\tswi\tuiscriptadaptors\scripts\uninstall.xml
+numnonexist=5
+nonexist0=x:\private\10273581\test.txt
+nonexist1=c:\sys\install\sisregistry\802730A1\00000001_0000.ctl
+nonexist2=x:\sys\install\sisregistry\802730A1\00000001_0000.ctl
+nonexist3=c:\sys\uninstall\802730A1_00000001
+nonexist4=x:\sys\uninstall\802730A1_00000001
+
+[stubwildcardupgrade]
+sis=z:\tswi\tsis\data\stubupgradewildcard_Root5CA.sis
+script=z:\tswi\tuiscriptadaptors\scripts\simple_drive_x.xml
+numexist=3
+exist0=x:\wildcardpu.txt
+exist1=c:\sys\install\sisregistry\802730A1\00000000_0001.ctl
+exist2=x:\sys\install\sisregistry\802730A1\00000000_0001.ctl
+numnonexist=2
+nonexist0=c:\sys\uninstall\802730A1_00000000
+nonexist1=x:\sys\uninstall\802730A1_00000000
+
+[removepuentry]
+numfiles=8
+file0=c:\sys\install\sisregistry\802730a1
+file1=c:\sys\install\integrityservices
+file2=c:\sys\install\sisregistry\backup.lst
+file3=c:\wildcardpu.txt
+file4=x:\sys\install\sisregistry\802730a1
+file5=x:\wildcardpu.txt
+file6=c:\sys\uninstall\80000001_00000000
+file7=c:\dummy-swi-plugin