# HG changeset patch
# User Brendan Donegan brendand@symbian.org
# Date 1254213344 -3600
# Node ID 14a7f8eb8b81fd40638a24f1e85b595d375dc5e6
# Parent  0565628aee182a2c1610bf42b6b6a38feadacf6b# Parent  90e0938774389013c393d77f80c5f280ec6ea9e8
merge

diff -r 0565628aee18 -r 14a7f8eb8b81 common/tools/ats/bctest/browser/browser.pl
--- a/common/tools/ats/bctest/browser/browser.pl	Tue Sep 29 09:30:34 2009 +0100
+++ b/common/tools/ats/bctest/browser/browser.pl	Tue Sep 29 09:35:44 2009 +0100
@@ -20,7 +20,7 @@
 use File::Path;
 
 unlink "browser.zip";
-##rmtree "temp";
+rmtree "temp";
 mkpath "temp/bcbrowser/winscw_udeb";
 mkpath "temp/bcbrowser/general/testframework";
 
diff -r 0565628aee18 -r 14a7f8eb8b81 common/tools/ats/bctest/messaging/messaging.pl
--- a/common/tools/ats/bctest/messaging/messaging.pl	Tue Sep 29 09:30:34 2009 +0100
+++ b/common/tools/ats/bctest/messaging/messaging.pl	Tue Sep 29 09:35:44 2009 +0100
@@ -20,7 +20,8 @@
 use File::Path;
 
 unlink "messaging.zip";
-##rmtree "temp";
+rmtree "temp";
+
 mkpath "temp/bcmessaging/testframework/general";
 mkpath "temp/bcmessaging/resource/general";
 mkpath "temp/bcmessaging/winscw_udeb";
@@ -28,15 +29,15 @@
 my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
 copy("messaging.xml",       "temp/test.xml");
 
-copy($epoc . "release/winscw/udeb/MMSClientMTMBCTester.dll",                "temp/bcmessaging/winscw_udeb/MMSClientMTMBCTester.dll");
-copy($epoc . "winscw/c/testframework/MMSClientMTMBCTester.ini",             "temp/bcmessaging/testframework/general/MMSClientMTMBCTester.ini");
-copy($epoc . "winscw/c/testframework/MMSClientMTMBCTester_TestImage.jpg",   "temp/bcmessaging/testframework/general/MMSClientMTMBCTester_TestImage.jpg");
-copy($epoc . "release/winscw/udeb/PluginBioControlAPITest.dll",             "temp/bcmessaging/winscw_udeb/PluginBioControlAPITest.dll");
-copy($epoc . "winscw/c/testframework/tcTestUIBioCombiner.cfg",              "temp/bcmessaging/testframework/general/tcTestUIBioCombiner.cfg");
-copy($epoc . "winscw/c/testframework/ui_PluginBioControlAPITest.cfg",       "temp/bcmessaging/testframework/general/ui_PluginBioControlAPITest.cfg");
-copy($epoc . "winscw/c/testframework/test.txt",                             "temp/bcmessaging/testframework/general/test.txt");
-copy($epoc . "winscw/c/testframework/PluginBioControlAPITest.rsc",          "temp/bcmessaging/testframework/general/PluginBioControlAPITest.rsc");
-copy($epoc . "data/z/resource/pluginbiocontrolapitest.rsc",                 "temp/bcmessaging/resource/general/pluginbiocontrolapitest.rsc");
-copy($epoc . "data/z/resource/pluginbiocontrolapitest.r01",                 "temp/bcmessaging/resource/general/pluginbiocontrolapitest.r01");
+copy($epoc . "release/winscw/udeb/MMSClientMTMBCTester.dll",                "temp/bcmessaging/winscw_udeb/MMSClientMTMBCTester.dll") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/MMSClientMTMBCTester.ini",             "temp/bcmessaging/testframework/general/MMSClientMTMBCTester.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/MMSClientMTMBCTester_TestImage.jpg",   "temp/bcmessaging/testframework/general/MMSClientMTMBCTester_TestImage.jpg") or die "failed : $!";
+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/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 0565628aee18 -r 14a7f8eb8b81 common/tools/ats/bctest/package_definition.xml