# HG changeset patch
# User brendand
# Date 1255097677 -3600
# Node ID 9c627d501af4c498b96b5be8b989c7a4fd380984
# Parent  770271caacf1d65bd0072cc6ed47aae560dc0af5
sorted out more stuff with the dynamic bc, fewer failures now

diff -r 770271caacf1 -r 9c627d501af4 common/tools/ats/bctest/base/basesvs.pl
--- a/common/tools/ats/bctest/base/basesvs.pl	Wed Oct 07 19:44:04 2009 +0100
+++ b/common/tools/ats/bctest/base/basesvs.pl	Fri Oct 09 15:14:37 2009 +0100
@@ -11,100 +11,39 @@
 mkpath "temp/basesvs/base/t_sfsrv/general";
 
 my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
-copy("test.xml",                                                          "temp/test.xml");
-
-copy $epoc . "release/winscw/udeb/t_fat32server.exe",                                               "temp/basesvs/winscw_udeb/t_fat32server.exe" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/t_perf.exe",                                                      "temp/basesvs/winscw_udeb/t_perf.exe" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/t_prompt.exe",                                                    "temp/basesvs/winscw_udeb/t_prompt.exe" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/t_sfsrv.exe",                                                     "temp/basesvs/winscw_udeb/t_sfsrv.exe" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/t_testfsy1.fsy",                                                  "temp/basesvs/winscw_udeb/t_testfsy1.fsy" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/t_testfxt.fxt",                                                   "temp/basesvs/winscw_udeb/t_testfxt.fxt" or die "failed : $!";
+copy("basesvs.xml",                                                          			"temp/test.xml");
 
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-driveunit-publicapi-any.script",                 "temp/basesvs/base/general/pbase-f32-driveunit-publicapi-any.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-format-publicapi-ram.script",                    "temp/basesvs/base/general/pbase-f32-format-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-format-publicapi-rem.script",                    "temp/basesvs/base/general/pbase-f32-format-publicapi-rem.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-format-publicapi-rom.script",                    "temp/basesvs/base/general/pbase-f32-format-publicapi-rom.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rawdisk-publicapi-ram.script",                   "temp/basesvs/base/general/pbase-f32-rawdisk-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rawdisk-publicapi-rem.script",                   "temp/basesvs/base/general/pbase-f32-rawdisk-publicapi-rem.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-dir-publicapi-ram.script",                       "temp/basesvs/base/general/pbase-f32-dir-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-dirscan-publicapi-ram.script",                   "temp/basesvs/base/general/pbase-f32-dirscan-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-file-publicapi-ram.script",                      "temp/basesvs/base/general/pbase-f32-file-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-fileman-publicapi-ram.script",                   "temp/basesvs/base/general/pbase-f32-fileman-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-fileman-publicapi-os.script",                    "temp/basesvs/base/general/pbase-f32-fileman-publicapi-os.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-filenamesidentical-publicapi-ram.script",        "temp/basesvs/base/general/pbase-f32-filenamesidentical-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rdir-publicapi-ram.script",                      "temp/basesvs/base/general/pbase-f32-rdir-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-entry-publicapi-ram.script",                     "temp/basesvs/base/general/pbase-f32-entry-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-filetext-publicapi-ram.script",                  "temp/basesvs/base/general/pbase-f32-filetext-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-volumeinfo-publicapi-any.script",                "temp/basesvs/base/general/pbase-f32-volumeinfo-publicapi-any.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parse-publicapi-any.script",                     "temp/basesvs/base/general/pbase-f32-parse-publicapi-any.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parseptr-publicapi-any.script",                  "temp/basesvs/base/general/pbase-f32-parseptr-publicapi-any.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parseptrc-publicapi-any.script",                 "temp/basesvs/base/general/pbase-f32-parseptrc-publicapi-any.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parse-inherited-publicapi-any.script",           "temp/basesvs/base/general/pbase-f32-parse-inherited-publicapi-any.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parseptr-inherited-publicapi-any.script",        "temp/basesvs/base/general/pbase-f32-parseptr-inherited-publicapi-any.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parseptrc-inherited-publicapi-any.script",       "temp/basesvs/base/general/pbase-f32-parseptrc-inherited-publicapi-any.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-entryarray-publicapi-ram.script",                "temp/basesvs/base/general/pbase-f32-entryarray-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-findfile-publicapi-os.script",                   "temp/basesvs/base/general/pbase-f32-findfile-publicapi-os.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-findfile-publicapi-rem.script",                  "temp/basesvs/base/general/pbase-f32-findfile-publicapi-rem.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-openfilescan-publicapi-ram.script",              "temp/basesvs/base/general/pbase-f32-openfilescan-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-drives-publicapi-any.script",                "temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-any.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-files-publicapi-any.script",                 "temp/basesvs/base/general/pbase-f32-rfs-files-publicapi-any.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-misc-publicapi-any.script",                  "temp/basesvs/base/general/pbase-f32-rfs-misc-publicapi-any.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-mounts-publicapi-any.script",                "temp/basesvs/base/general/pbase-f32-rfs-mounts-publicapi-any.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-publicapi-os.script",                        "temp/basesvs/base/general/pbase-f32-rfs-publicapi-os.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-drives-publicapi-ram.script",                "temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-files-publicapi-ram.script",                 "temp/basesvs/base/general/pbase-f32-rfs-files-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-misc-publicapi-ram.script",                  "temp/basesvs/base/general/pbase-f32-rfs-misc-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-mounts-publicapi-ram.script",                "temp/basesvs/base/general/pbase-f32-rfs-mounts-publicapi-ram.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-publicapi-rom.script",                       "temp/basesvs/base/general/pbase-f32-rfs-publicapi-rom.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-drives-publicapi-rem.script",                "temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-rem.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/t_prompt.exe",                                       	"temp/basesvs/winscw_udeb/t_prompt.exe" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/t_sfsrv.exe",                                        	"temp/basesvs/winscw_udeb/t_sfsrv.exe" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/t_testfsy1.fsy",                                     	"temp/basesvs/winscw_udeb/t_testfsy1.fsy" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/t_testfxt.fxt",                                      	"temp/basesvs/winscw_udeb/t_testfxt.fxt" or die "failed : $!";
 
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-driveunit-publicapi.ini",                        "temp/basesvs/base/general/pbase-f32-driveunit-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-format-publicapi.ini",                           "temp/basesvs/base/general/pbase-f32-format-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rawdisk-publicapi.ini",                          "temp/basesvs/base/general/pbase-f32-rawdisk-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-dir-publicapi.ini",                              "temp/basesvs/base/general/pbase-f32-dir-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-dirscan-publicapi.ini",                          "temp/basesvs/base/general/pbase-f32-dirscan-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-file-publicapi.ini",                             "temp/basesvs/base/general/pbase-f32-file-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-fileman-publicapi.ini",                          "temp/basesvs/base/general/pbase-f32-fileman-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-filenamesidentical-publicapi.ini",               "temp/basesvs/base/general/pbase-f32-filenamesidentical-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rdir-publicapi.ini",                             "temp/basesvs/base/general/pbase-f32-rdir-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-entry-publicapi.ini",                            "temp/basesvs/base/general/pbase-f32-entry-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-filetext-publicapi.ini",                         "temp/basesvs/base/general/pbase-f32-filetext-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-volumeinfo-publicapi.ini",                       "temp/basesvs/base/general/pbase-f32-volumeinfo-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parse-publicapi.ini",                            "temp/basesvs/base/general/pbase-f32-parse-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parseptr-publicapi.ini",                         "temp/basesvs/base/general/pbase-f32-parseptr-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parseptrc-publicapi.ini",                        "temp/basesvs/base/general/pbase-f32-parseptrc-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-parsebase-inherited-publicapi.ini",              "temp/basesvs/base/general/pbase-f32-parsebase-inherited-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-entryarray-publicapi.ini",                       "temp/basesvs/base/general/pbase-f32-entryarray-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-findfile-publicapi.ini",                         "temp/basesvs/base/general/pbase-f32-findfile-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-openfilescan-publicapi.ini",                     "temp/basesvs/base/general/pbase-f32-openfilescan-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-drives-publicapi-any.ini",                   "temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-any.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-files-publicapi-any.ini",                    "temp/basesvs/base/general/pbase-f32-rfs-files-publicapi-any.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-misc-publicapi-any.ini",                     "temp/basesvs/base/general/pbase-f32-rfs-misc-publicapi-any.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-mounts-publicapi-any.ini",                   "temp/basesvs/base/general/pbase-f32-rfs-mounts-publicapi-any.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-publicapi-os.ini",                           "temp/basesvs/base/general/pbase-f32-rfs-publicapi-os.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-drives-publicapi-ram.ini",                   "temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-ram.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-files-publicapi-ram.ini",                    "temp/basesvs/base/general/pbase-f32-rfs-files-publicapi-ram.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-misc-publicapi-ram.ini",                     "temp/basesvs/base/general/pbase-f32-rfs-misc-publicapi-ram.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-mounts-publicapi-ram.ini",                   "temp/basesvs/base/general/pbase-f32-rfs-mounts-publicapi-ram.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-publicapi-rom.ini",                          "temp/basesvs/base/general/pbase-f32-rfs-publicapi-rom.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/pbase-f32-rfs-drives-publicapi-rem.ini",                   "temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-rem.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/base_f32_env.ini",                                         "temp/basesvs/base/general/base_f32_env.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/t_base.tcs",                                               "temp/basesvs/base/general/t_base.tcs" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-drives-publicapi-any.script",                	"temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-any.script" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-files-publicapi-any.script",                 	"temp/basesvs/base/general/pbase-f32-rfs-files-publicapi-any.script" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-misc-publicapi-any.script",                  	"temp/basesvs/base/general/pbase-f32-rfs-misc-publicapi-any.script" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-mounts-publicapi-any.script",                	"temp/basesvs/base/general/pbase-f32-rfs-mounts-publicapi-any.script" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-publicapi-os.script",                        	"temp/basesvs/base/general/pbase-f32-rfs-publicapi-os.script" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-drives-publicapi-ram.script",                	"temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-ram.script" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-files-publicapi-ram.script",                 	"temp/basesvs/base/general/pbase-f32-rfs-files-publicapi-ram.script" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-misc-publicapi-ram.script",                  	"temp/basesvs/base/general/pbase-f32-rfs-misc-publicapi-ram.script" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-mounts-publicapi-ram.script",                	"temp/basesvs/base/general/pbase-f32-rfs-mounts-publicapi-ram.script" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-publicapi-rom.script",                       	"temp/basesvs/base/general/pbase-f32-rfs-publicapi-rom.script" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-drives-publicapi-rem.script",                	"temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-rem.script" or die "failed : $!";
 
-copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/test.txt",                                         "temp/basesvs/base/t_sfsrv/general/test.txt" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/test_rom.txt",                                     "temp/basesvs/base/t_sfsrv/general/test_rom.txt" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/usbload.zip",                                      "temp/basesvs/base/t_sfsrv/general/usbload.zip" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/test1.txt",                                        "temp/basesvs/base/t_sfsrv/general/test1.txt" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/test2.txt",                                        "temp/basesvs/base/t_sfsrv/general/test2.txt" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/test3.txt",                                        "temp/basesvs/base/t_sfsrv/general/test3.txt" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/1mb",                                              "temp/basesvs/base/t_sfsrv/general/1mb" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/any.txt",                                          "temp/basesvs/base/t_sfsrv/general/any.txt" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/big_line.txt",                                     "temp/basesvs/base/t_sfsrv/general/big_line.txt" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/filetext_eof.txt",                                 "temp/basesvs/base/t_sfsrv/general/filetext_eof.txt" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/filetext_read.txt",                                "temp/basesvs/base/t_sfsrv/general/filetext_read.txt" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/multiline.txt",                                    "temp/basesvs/base/t_sfsrv/general/multiline.txt" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/new_file.txt",                                     "temp/basesvs/base/t_sfsrv/general/new_file.txt" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/oneliner.txt",                                     "temp/basesvs/base/t_sfsrv/general/oneliner.txt" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/base/t_sfsrv/big.txt",                                          "temp/basesvs/base/t_sfsrv/general/big.txt" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-drives-publicapi-any.ini",                   	"temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-any.ini" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-files-publicapi-any.ini",                    	"temp/basesvs/base/general/pbase-f32-rfs-files-publicapi-any.ini" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-misc-publicapi-any.ini",                     	"temp/basesvs/base/general/pbase-f32-rfs-misc-publicapi-any.ini" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-mounts-publicapi-any.ini",                   	"temp/basesvs/base/general/pbase-f32-rfs-mounts-publicapi-any.ini" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-publicapi-os.ini",                           	"temp/basesvs/base/general/pbase-f32-rfs-publicapi-os.ini" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-drives-publicapi-ram.ini",                   	"temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-ram.ini" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-files-publicapi-ram.ini",                    	"temp/basesvs/base/general/pbase-f32-rfs-files-publicapi-ram.ini" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-misc-publicapi-ram.ini",                     	"temp/basesvs/base/general/pbase-f32-rfs-misc-publicapi-ram.ini" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-mounts-publicapi-ram.ini",                   	"temp/basesvs/base/general/pbase-f32-rfs-mounts-publicapi-ram.ini" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-publicapi-rom.ini",                          	"temp/basesvs/base/general/pbase-f32-rfs-publicapi-rom.ini" or die "failed : $!";
+copy $epoc . "winscw/c/base/pbase-f32-rfs-drives-publicapi-rem.ini",                   	"temp/basesvs/base/general/pbase-f32-rfs-drives-publicapi-rem.ini" or die "failed : $!";
+copy $epoc . "winscw/c/base/winscw/base_f32_env.ini",                                   "temp/basesvs/base/general/base_f32_env.ini" or die "failed : $!";
+
+copy $epoc . "winscw/c/base/t_sfsrv/test.txt",                            				"temp/basesvs/base/t_sfsrv/general/test.txt" or die "failed : $!";
+copy $epoc . "winscw/c/base/t_sfsrv/usbload.zip",                         "temp/basesvs/base/t_sfsrv/general/usbload.zip" or die "failed : $!";
 
 system("7z a -tzip basesvs.zip ./temp/*");
diff -r 770271caacf1 -r 9c627d501af4 common/tools/ats/bctest/messaging/messaging.pl
--- a/common/tools/ats/bctest/messaging/messaging.pl	Wed Oct 07 19:44:04 2009 +0100
+++ b/common/tools/ats/bctest/messaging/messaging.pl	Fri Oct 09 15:14:37 2009 +0100
@@ -23,6 +23,7 @@
 rmtree "temp";
 
 mkpath "temp/bcmessaging/testframework/general";
+mkpath "temp/bcmessaging/pluginbiocontrolapitest/general";
 mkpath "temp/bcmessaging/resource/general";
 mkpath "temp/bcmessaging/winscw_udeb";
 
@@ -35,9 +36,8 @@
 copy($epoc . "release/winscw/udeb/PluginBioControlAPITest.dll",             "temp/bcmessaging/winscw_udeb/PluginBioControlAPITest.dll") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/tcTestUIBioCombiner.cfg",              "temp/bcmessaging/testframework/general/tcTestUIBioCombiner.cfg") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/ui_PluginBioControlAPITest.cfg",       "temp/bcmessaging/testframework/general/ui_PluginBioControlAPITest.cfg") or die "failed : $!";
-copy($epoc . "winscw/c/testframework/test.txt",                             "temp/bcmessaging/testframework/general/test.txt") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/test.txt",                             "temp/bcmessaging/pluginbiocontrolapitest/general/test.txt") or die "failed : $!";
 copy($epoc . "winscw/c/testframework/PluginBioControlAPITest.rsc",          "temp/bcmessaging/testframework/general/PluginBioControlAPITest.rsc") or die "failed : $!";
 copy($epoc . "data/z/resource/pluginbiocontrolapitest.rsc",                 "temp/bcmessaging/resource/general/pluginbiocontrolapitest.rsc") or die "failed : $!";
-copy($epoc . "data/z/resource/pluginbiocontrolapitest.r01",                 "temp/bcmessaging/resource/general/pluginbiocontrolapitest.r01") or die "failed : $!";
 
 system("7z a -tzip messaging.zip ./temp/*");
\ No newline at end of file
diff -r 770271caacf1 -r 9c627d501af4 common/tools/ats/bctest/messaging/messaging.xml
--- a/common/tools/ats/bctest/messaging/messaging.xml	Wed Oct 07 19:44:04 2009 +0100
+++ b/common/tools/ats/bctest/messaging/messaging.xml	Fri Oct 09 15:14:37 2009 +0100
@@ -105,8 +105,17 @@
 						<params>
 							<param type="data"/>
 							<param src="test.txt"/>
-							<param dst="c:\testframework\test.txt"/>
-							<param component-path="bcmessaging\testframework" />
+							<param dst="e:\testing\data\pluginbiocontrolapitest\test.txt"/>
+							<param component-path="bcmessaging\pluginbiocontrolapitest" />
+						</params>
+					</step>
+					<step id="" name="test.txt (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="test.txt"/>
+							<param dst="c:\testing\data\pluginbiocontrolapitest\test.txt"/>
+							<param component-path="bcmessaging\pluginbiocontrolapitest" />
 						</params>
 					</step>
 					<step id="" name="PluginBioControlAPITest.rsc on C (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
@@ -114,28 +123,10 @@
 						<params>
 							<param type="data"/>
 							<param src="PluginBioControlAPITest.rsc"/>
-							<param dst="c:\testframework\PluginBioControlAPITest.rsc"/>
+							<param dst="c:\resource\PluginBioControlAPITest.rsc"/>
 							<param component-path="bcmessaging\testframework" />
 						</params>
 					</step>
-					<step id="" name="PluginBioControlAPITest.rsc on Z (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="pluginbiocontrolapitest.rsc"/>
-							<param dst="z:\resource\pluginbiocontrolapitest.rsc"/>
-							<param component-path="bcmessaging\resource" />
-						</params>
-					</step>
-					<step id="" name="PluginBioControlAPITest.r01 on Z (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="pluginbiocontrolapitest.r01"/>
-							<param dst="z:\resource\pluginbiocontrolapitest.r01"/>
-							<param component-path="bcmessaging\resource" />
-						</params>
-					</step>  
 					<step id="" name="PluginBioControlAPITest (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
 						<command>execute</command>
 						<params>
@@ -162,9 +153,8 @@
         <file>bcmessaging/winscw_udeb/PluginBioControlAPITest.dll</file>
         <file>bcmessaging/testframework/general/tcTestUIBioCombiner.cfg</file>
         <file>bcmessaging/testframework/general/ui_PluginBioControlAPITest.cfg</file>
-        <file>bcmessaging/testframework/general/test.txt</file>
+        <file>bcmessaging/pluginbiocontrolapitest/general/test.txt</file>
         <file>bcmessaging/testframework/general/PluginBioControlAPITest.rsc</file>
         <file>bcmessaging/resource/general/pluginbiocontrolapitest.rsc</file>
-        <file>bcmessaging/resource/general/pluginbiocontrolapitest.r01</file>
 	</files>
 </test>
\ No newline at end of file
diff -r 770271caacf1 -r 9c627d501af4 common/tools/ats/bctest/messagingmw/sendui/sendui.pl
--- a/common/tools/ats/bctest/messagingmw/sendui/sendui.pl	Wed Oct 07 19:44:04 2009 +0100
+++ b/common/tools/ats/bctest/messagingmw/sendui/sendui.pl	Fri Oct 09 15:14:37 2009 +0100
@@ -12,7 +12,7 @@
 # Brendan Donegan <brendand@symbian.org>
 #
 # Description:
-# Script to build ATS test drop for BC Profiles Engine tests
+# Script to build ATS test drop for BC Send UI tests
 
 
 use strict;
@@ -20,15 +20,17 @@
 use File::Path;
 
 unlink "sendui.zip";
-##rmtree "temp";
+rmtree "temp";
 mkpath "temp/bcsendui/general/testframework";
+mkpath "temp/bcsendui/general/senduiapitest";
 mkpath "temp/bcsendui/winscw_udeb";
 
 my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
 copy("sendui.xml",	"temp/test.xml");
 
-copy($epoc . "release/winscw/udeb/senduiapitest.dll",                   "temp/bcsendui/winscw_udeb/senduiapitest.dll");
-copy($epoc . "winscw/c/testframework/testframework_sendui.ini",         "temp/bcsendui/general/testframework/testframework_sendui.ini");
-copy($epoc . "winscw/c/testframework/ui_senduiapitest.cfg",             "temp/bcsendui/general/testframework/ui_senduiapitest.cfg");
+copy($epoc . "release/winscw/udeb/senduiapitest.dll",                   "temp/bcsendui/winscw_udeb/senduiapitest.dll") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_sendui.ini",         "temp/bcsendui/general/testframework/testframework_sendui.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/ui_senduiapitest.cfg",             "temp/bcsendui/general/testframework/ui_senduiapitest.cfg") or die "failed : $!";
+copy($epoc . "winscw/c/data/testdata/senduiapitest/attachment.txt",		"temp/bcsendui/general/senduiapitest/attachment.txt") or die "failed : $!";
 
 system("7z a -tzip sendui.zip ./temp/*");
\ No newline at end of file
diff -r 770271caacf1 -r 9c627d501af4 common/tools/ats/bctest/messagingmw/sendui/sendui.xml
--- a/common/tools/ats/bctest/messagingmw/sendui/sendui.xml	Wed Oct 07 19:44:04 2009 +0100
+++ b/common/tools/ats/bctest/messagingmw/sendui/sendui.xml	Fri Oct 09 15:14:37 2009 +0100
@@ -49,7 +49,16 @@
 							<param dst="c:\testframework\ui_senduiapitest.cfg"/>
 							<param component-path="bcsendui" />
 						</params>
-					</step>  
+					</step>
+					<step id="" name="attachment.txt (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="senduiapitest\attachment.txt"/>
+							<param dst="c:\data\testdata\senduiapitest\attachment.txt"/>
+							<param component-path="bcsendui" />
+						</params>
+					</step> 					
 					<step id="" name="senduiapitest (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
 						<command>execute</command>
 						<params>
@@ -73,5 +82,6 @@
 		<file>bcsendui/winscw_udeb/senduiapitest.dll</file>
         <file>bcsendui/general/testframework/testframework_sendui.ini</file>
         <file>bcsendui/general/testframework/ui_senduiapitest.cfg</file>
+		<file>bcsendui/general/senduiapitest/attachment.txt</file>
 	</files>
 </test>
\ No newline at end of file