# HG changeset patch # User Louis Henry Nayegon # Date 1255618798 -3600 # Node ID 92fa86ed31d80695881662ac40681c9c6e211f46 # Parent 980808d9c08e2dd2f323c143e0859edb1128b463# Parent 925bcbd5c2d19cd4dc9315174eec7d9feeabd3ae Merge diff -r 980808d9c08e -r 92fa86ed31d8 common/tools/ats/bctest/contacts/phonebook/phonebook.pl --- a/common/tools/ats/bctest/contacts/phonebook/phonebook.pl Thu Oct 15 15:59:16 2009 +0100 +++ b/common/tools/ats/bctest/contacts/phonebook/phonebook.pl Thu Oct 15 15:59:58 2009 +0100 @@ -22,6 +22,7 @@ unlink "phonebooktest.zip"; rmtree "temp"; mkpath "temp/phonebooktest/general/testframework"; +mkpath "temp/phonebooktest/general/resource"; mkpath "temp/phonebooktest/general/bcardtest2"; mkpath "temp/phonebooktest/winscw_udeb/z/resource"; @@ -131,7 +132,7 @@ copy($epoc . "winscw/c/testframework/testframework_pbkaddsel.ini", "temp/phonebooktest/general/testframework/testframework_pbkaddsel.ini") or die "failed : $!"; copy($epoc . "winscw/c/testframework/tcbctestpbkaddsel.cfg", "temp/phonebooktest/general/testframework/tcbctestpbkaddsel.cfg") or die "failed : $!"; copy($epoc . "winscw/c/testframework/ui_bctestpbkaddsel.cfg", "temp/phonebooktest/general/testframework/ui_bctestpbkaddsel.cfg") or die "failed : $!"; -copy($epoc . "release/winscw/udeb/z/resource/pbkaddressselect.rsc", "temp/phonebooktest/winscw_udeb/z/resource/pbkaddressselect.rsc") or die "failed : $!"; +copy($epoc . "release/winscw/udeb/z/resource/pbkaddressselect.rsc", "temp/phonebooktest/general/resource/pbkaddressselect.rsc") or die "failed : $!"; copy($epoc . "release/winscw/udeb/mtpbkphonenumberselectbase.dll", "temp/phonebooktest/winscw_udeb/mtpbkphonenumberselectbase.dll") or die "failed : $!"; copy($epoc . "winscw/c/testframework/testframework_numsel.ini", "temp/phonebooktest/general/testframework/testframework_numsel.ini") or die "failed : $!"; diff -r 980808d9c08e -r 92fa86ed31d8 common/tools/ats/bctest/contacts/phonebook/phonebook.xml --- a/common/tools/ats/bctest/contacts/phonebook/phonebook.xml Thu Oct 15 15:59:16 2009 +0100 +++ b/common/tools/ats/bctest/contacts/phonebook/phonebook.xml Thu Oct 15 15:59:58 2009 +0100 @@ -567,9 +567,9 @@ install - - - + + + @@ -1047,7 +1047,7 @@ phonebooktest/general/testframework/testframework_pbkaddsel.ini phonebooktest/general/testframework/tcbctestpbkaddsel.cfg phonebooktest/general/testframework/ui_bctestpbkaddsel.cfg - phonebooktest/winscw_udeb/z/resource/pbkaddressselect.rsc + phonebooktest/general/resource/pbkaddressselect.rsc phonebooktest/winscw_udeb/mtpbkphonenumberselectbase.dll phonebooktest/general/testframework/testframework_numsel.ini diff -r 980808d9c08e -r 92fa86ed31d8 common/tools/ats/bctest/ssl/ssl.pl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/tools/ats/bctest/ssl/ssl.pl Thu Oct 15 15:59:58 2009 +0100 @@ -0,0 +1,103 @@ +#!/usr/bin/perl +# Copyright (c) 2009 Symbian Foundation Ltd +# This component and the accompanying materials are made available +# under the terms of the License "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Symbian Foundation Ltd - initial contribution. +# +# Contributors: +# Maciej Seroka +# +# Description: +# Script to build ATS test drop for Secure Socket Layer BC tests + + +use strict; +use File::Copy; +use File::Path; + +unlink "ssltest.zip"; +rmtree "temp"; +mkpath "temp/ssltest/general/testframework"; +mkpath "temp/ssltest/winscw_udeb"; + +my $epoc=$ENV{'EPOCROOT'} . "epoc32/"; +copy("ssl.xml", "temp/test.xml"); + +copy($epoc . "winscw/c/testframework/crypto_test/testframework.ini", "temp/ssltest/general/testframework/testframework.ini") or die "failed : $!"; +copy($epoc . "winscw/c/testframework/crypto_test.cfg", "temp/ssltest/general/testframework/crypto_test.cfg") or die "failed : $!"; +copy($epoc . "winscw/c/testframework/evptests.txt", "temp/ssltest/general/testframework/evptests.txt") or die "failed : $!"; +copy($epoc . "winscw/c/tpkcs7d.txt", "temp/ssltest/general/testframework/tpkcs7d.txt") or die "failed : $!"; +copy($epoc . "winscw/c/tpkcs7.txt", "temp/ssltest/general/testframework/tpkcs7.txt") or die "failed : $!"; +copy($epoc . "winscw/c/treq2.txt", "temp/ssltest/general/testframework/treq2.txt") or die "failed : $!"; +copy($epoc . "winscw/c/treq.txt", "temp/ssltest/general/testframework/treq.txt") or die "failed : $!"; +copy($epoc . "winscw/c/trsa.txt", "temp/ssltest/general/testframework/trsa.txt") or die "failed : $!"; +copy($epoc . "winscw/c/tsid.txt", "temp/ssltest/general/testframework/tsid.txt") or die "failed : $!"; +copy($epoc . "winscw/c/tx5091.txt", "temp/ssltest/general/testframework/tx5091.txt") or die "failed : $!"; +copy($epoc . "winscw/c/tx5092.txt", "temp/ssltest/general/testframework/tx5092.txt") or die "failed : $!"; +copy($epoc . "winscw/c/tx509.txt", "temp/ssltest/general/testframework/tx509.txt") or die "failed : $!"; +copy($epoc . "winscw/c/tcrl.txt", "temp/ssltest/general/testframework/tcrl.txt") or die "failed : $!"; +copy($epoc . "winscw/c/testenc.txt", "temp/ssltest/general/testframework/testenc.txt") or die "failed : $!"; +copy($epoc . "winscw/c/testgen.txt", "temp/ssltest/general/testframework/testgen.txt") or die "failed : $!"; +copy($epoc . "winscw/c/testss.txt", "temp/ssltest/general/testframework/testss.txt") or die "failed : $!"; +copy($epoc . "winscw/c/test_verify.txt", "temp/ssltest/general/testframework/test_verify.txt") or die "failed : $!"; +copy($epoc . "winscw/c/CAss.cnf", "temp/ssltest/general/testframework/CAss.cnf") or die "failed : $!"; +copy($epoc . "winscw/c/openssl.cnf", "temp/ssltest/general/testframework/openssl.cnf") or die "failed : $!"; +copy($epoc . "winscw/c/P1ss.cnf", "temp/ssltest/general/testframework/P1ss.cnf") or die "failed : $!"; +copy($epoc . "winscw/c/P2ss.cnf", "temp/ssltest/general/testframework/P2ss.cnf") or die "failed : $!"; +copy($epoc . "winscw/c/test.cnf", "temp/ssltest/general/testframework/test.cnf") or die "failed : $!"; +copy($epoc . "winscw/c/Uss.cnf", "temp/ssltest/general/testframework/Uss.cnf") or die "failed : $!"; +copy($epoc . "winscw/c/argena.pem", "temp/ssltest/general/testframework/argena.pem") or die "failed : $!"; +copy($epoc . "winscw/c/argeng.pem", "temp/ssltest/general/testframework/argeng.pem") or die "failed : $!"; +copy($epoc . "winscw/c/eng1.pem", "temp/ssltest/general/testframework/eng1.pem") or die "failed : $!"; +copy($epoc . "winscw/c/eng2.pem", "temp/ssltest/general/testframework/eng2.pem") or die "failed : $!"; +copy($epoc . "winscw/c/eng3.pem", "temp/ssltest/general/testframework/eng3.pem") or die "failed : $!"; +copy($epoc . "winscw/c/eng4.pem", "temp/ssltest/general/testframework/eng4.pem") or die "failed : $!"; +copy($epoc . "winscw/c/eng5.pem", "temp/ssltest/general/testframework/eng5.pem") or die "failed : $!"; +copy($epoc . "winscw/c/pkcs7-1.pem", "temp/ssltest/general/testframework/pkcs7-1.pem") or die "failed : $!"; +copy($epoc . "winscw/c/RegTP-5R.pem", "temp/ssltest/general/testframework/RegTP-5R.pem") or die "failed : $!"; +copy($epoc . "winscw/c/RegTP-6R.pem", "temp/ssltest/general/testframework/RegTP-6R.pem") or die "failed : $!"; +copy($epoc . "winscw/c/testcrl.pem", "temp/ssltest/general/testframework/testcrl.pem") or die "failed : $!"; +copy($epoc . "winscw/c/testp7.pem", "temp/ssltest/general/testframework/testp7.pem") or die "failed : $!"; +copy($epoc . "winscw/c/testreq.pem", "temp/ssltest/general/testframework/testreq.pem") or die "failed : $!"; +copy($epoc . "winscw/c/testreq2.pem", "temp/ssltest/general/testframework/testreq2.pem") or die "failed : $!"; +copy($epoc . "winscw/c/testrsa.pem", "temp/ssltest/general/testframework/testrsa.pem") or die "failed : $!"; +copy($epoc . "winscw/c/testsid.pem", "temp/ssltest/general/testframework/testsid.pem") or die "failed : $!"; +copy($epoc . "winscw/c/testx509.pem", "temp/ssltest/general/testframework/testx509.pem") or die "failed : $!"; +copy($epoc . "winscw/c/thawteCb.pem", "temp/ssltest/general/testframework/thawteCb.pem") or die "failed : $!"; +copy($epoc . "winscw/c/thawteCp.pem", "temp/ssltest/general/testframework/thawteCp.pem") or die "failed : $!"; +copy($epoc . "winscw/c/v3-cert1.pem", "temp/ssltest/general/testframework/v3-cert1.pem") or die "failed : $!"; +copy($epoc . "winscw/c/v3-cert2.pem", "temp/ssltest/general/testframework/v3-cert2.pem") or die "failed : $!"; +copy($epoc . "winscw/c/vsign1.pem", "temp/ssltest/general/testframework/vsign1.pem") or die "failed : $!"; +copy($epoc . "winscw/c/vsign3.pem", "temp/ssltest/general/testframework/vsign3.pem") or die "failed : $!"; +copy($epoc . "winscw/c/vsignss.pem", "temp/ssltest/general/testframework/vsignss.pem") or die "failed : $!"; +copy($epoc . "winscw/c/wellsfgo.pem", "temp/ssltest/general/testframework/wellsfgo.pem") or die "failed : $!"; +copy($epoc . "winscw/c/certCA.ss", "temp/ssltest/general/testframework/certCA.ss") or die "failed : $!"; +copy($epoc . "winscw/c/certU.ss", "temp/ssltest/general/testframework/certU.ss") or die "failed : $!"; +copy($epoc . "winscw/c/keyCA.ss", "temp/ssltest/general/testframework/keyCA.ss") or die "failed : $!"; +copy($epoc . "winscw/c/keyU.ss", "temp/ssltest/general/testframework/keyU.ss") or die "failed : $!"; +copy($epoc . "winscw/c/reqCA.ss", "temp/ssltest/general/testframework/reqCA.ss") or die "failed : $!"; +copy($epoc . "winscw/c/reqU.ss", "temp/ssltest/general/testframework/reqU.ss") or die "failed : $!"; +copy($epoc . "winscw/c/reqCA.ss2", "temp/ssltest/general/testframework/reqCA.ss2") or die "failed : $!"; +copy($epoc . "winscw/c/certP1.ss", "temp/ssltest/general/testframework/certP1.ss") or die "failed : $!"; +copy($epoc . "winscw/c/certP2.ss", "temp/ssltest/general/testframework/certP2.ss") or die "failed : $!"; +copy($epoc . "winscw/c/intP1.ss", "temp/ssltest/general/testframework/intP1.ss") or die "failed : $!"; +copy($epoc . "winscw/c/intP2.ss", "temp/ssltest/general/testframework/intP2.ss") or die "failed : $!"; +copy($epoc . "winscw/c/keyP1.ss", "temp/ssltest/general/testframework/keyP1.ss") or die "failed : $!"; +copy($epoc . "winscw/c/keyP2.ss", "temp/ssltest/general/testframework/keyP2.ss") or die "failed : $!"; +copy($epoc . "winscw/c/reqP1.ss", "temp/ssltest/general/testframework/reqP1.ss") or die "failed : $!"; +copy($epoc . "winscw/c/reqP2.ss", "temp/ssltest/general/testframework/reqP2.ss") or die "failed : $!"; +copy($epoc . "winscw/c/tmp_intP2.ss", "temp/ssltest/general/testframework/tmp_intP2.ss") or die "failed : $!"; +copy($epoc . "winscw/c/Makefile", "temp/ssltest/general/testframework/Makefile") or die "failed : $!"; +copy($epoc . "winscw/c/ca_cert.der", "temp/ssltest/general/testframework/ca_cert.der") or die "failed : $!"; +copy($epoc . "winscw/c/ca_cert.pem", "temp/ssltest/general/testframework/ca_cert.pem") or die "failed : $!"; +copy($epoc . "winscw/c/server.pem", "temp/ssltest/general/testframework/server.pem") or die "failed : $!"; +copy($epoc . "winscw/c/server2.pem", "temp/ssltest/general/testframework/server2.pem") or die "failed : $!"; +copy($epoc . "release/winscw/udeb/crypto_test.dll", "temp/ssltest/winscw_udeb/crypto_test.dll") or die "failed : $!"; +copy($epoc . "release/winscw/udeb/openssl.exe", "temp/ssltest/winscw_udeb/openssl.exe") or die "failed : $!"; +copy($epoc . "release/winscw/udeb/ssltest.exe", "temp/ssltest/winscw_udeb/ssltest.exe") or die "failed : $!"; + +system("7z a -tzip ssltest.zip ./temp/*"); diff -r 980808d9c08e -r 92fa86ed31d8 common/tools/ats/bctest/ssl/ssl.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/tools/ats/bctest/ssl/ssl.xml Thu Oct 15 15:59:58 2009 +0100 @@ -0,0 +1,1181 @@ + + + 1 + admin + 10 + + Secure Socket Layer BC Tests + + + + + + + + + + + + + + makedir + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + fetch-log + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + execute + + + + + + + + + + + + + ssltest/general/testframework/crypto_test.cfg + ssltest/general/testframework/TestFramework.ini + ssltest/general/testframework/evptests.txt + ssltest/general/testframework/tpkcs7d.txt + ssltest/general/testframework/tpkcs7.txt + ssltest/general/testframework/treq2.txt + ssltest/general/testframework/treq.txt + ssltest/general/testframework/trsa.txt + ssltest/general/testframework/tsid.txt + ssltest/general/testframework/tx5091.txt + ssltest/general/testframework/tx5092.txt + ssltest/general/testframework/tx509.txt + ssltest/general/testframework/tcrl.txt + ssltest/general/testframework/testenc.txt + ssltest/general/testframework/testgen.txt + ssltest/general/testframework/testss.txt + ssltest/general/testframework/test_verify.txt + ssltest/general/testframework/CAss.cnf + ssltest/general/testframework/openssl.cnf + ssltest/general/testframework/P1ss.cnf + ssltest/general/testframework/P2ss.cnf + ssltest/general/testframework/test.cnf + ssltest/general/testframework/Uss.cnf + ssltest/general/testframework/argena.pem + ssltest/general/testframework/argeng.pem + ssltest/general/testframework/eng1.pem + ssltest/general/testframework/eng2.pem + ssltest/general/testframework/eng3.pem + ssltest/general/testframework/eng4.pem + ssltest/general/testframework/eng5.pem + ssltest/general/testframework/pkcs7-1.pem + ssltest/general/testframework/RegTP-5R.pem + ssltest/general/testframework/RegTP-6R.pem + ssltest/general/testframework/testcrl.pem + ssltest/general/testframework/testp7.pem + ssltest/general/testframework/testreq.pem + ssltest/general/testframework/testreq2.pem + ssltest/general/testframework/testrsa.pem + ssltest/general/testframework/testsid.pem + ssltest/general/testframework/testx509.pem + ssltest/general/testframework/thawteCb.pem + ssltest/general/testframework/thawteCp.pem + ssltest/general/testframework/v3-cert1.pem + ssltest/general/testframework/v3-cert2.pem + ssltest/general/testframework/vsign1.pem + ssltest/general/testframework/vsign3.pem + ssltest/general/testframework/vsignss.pem + ssltest/general/testframework/wellsfgo.pem + ssltest/general/testframework/certCA.ss + ssltest/general/testframework/certU.ss + ssltest/general/testframework/keyCA.ss + ssltest/general/testframework/keyU.ss + ssltest/general/testframework/reqCA.ss + ssltest/general/testframework/reqU.ss + ssltest/general/testframework/reqCA.ss2 + ssltest/general/testframework/certP1.ss + ssltest/general/testframework/certP2.ss + ssltest/general/testframework/intP1.ss + ssltest/general/testframework/intP2.ss + ssltest/general/testframework/keyP1.ss + ssltest/general/testframework/keyP2.ss + ssltest/general/testframework/reqP1.ss + ssltest/general/testframework/reqP2.ss + ssltest/general/testframework/tmp_intP2.ss + ssltest/general/testframework/Makefile + ssltest/general/testframework/ca_cert.der + ssltest/general/testframework/ca_cert.pem + ssltest/general/testframework/server.pem + ssltest/general/testframework/server2.pem + ssltest/winscw_udeb/crypto_test.dll + ssltest/winscw_udeb/openssl.exe + ssltest/winscw_udeb/ssltest.exe + + diff -r 980808d9c08e -r 92fa86ed31d8 common/tools/ats/bctest/tlocale/tlocale.pl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/tools/ats/bctest/tlocale/tlocale.pl Thu Oct 15 15:59:58 2009 +0100 @@ -0,0 +1,34 @@ +#!/usr/bin/perl +# Copyright (c) 2009 Symbian Foundation Ltd +# This component and the accompanying materials are made available +# under the terms of the License "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Symbian Foundation Ltd - initial contribution. +# +# Contributors: +# Maciej Seroka +# +# Description: +# Script to build ATS test drop for TLocale BC tests + + +use strict; +use File::Copy; +use File::Path; + +unlink "tlocaletest.zip"; +rmtree "temp"; +mkpath "temp/tlocaletest/general/testframework"; +mkpath "temp/tlocaletest/winscw_udeb"; + +my $epoc=$ENV{'EPOCROOT'} . "epoc32/"; +copy("tlocale.xml", "temp/test.xml"); + +copy($epoc . "release/winscw/udeb/tlocale.dll", "temp/tlocaletest/winscw_udeb/tlocale.dll") or die "failed : $!"; +copy($epoc . "winscw/c/testframework/testframework_tlocale.ini", "temp/tlocaletest/general/testframework/testframework_tlocale.ini") or die "failed : $!"; +copy($epoc . "winscw/c/testframework/tlocale.cfg", "temp/tlocaletest/general/testframework/tlocale.cfg") or die "failed : $!"; + +system("7z a -tzip tlocaletest.zip ./temp/*"); diff -r 980808d9c08e -r 92fa86ed31d8 common/tools/ats/bctest/tlocale/tlocale.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/tools/ats/bctest/tlocale/tlocale.xml Thu Oct 15 15:59:58 2009 +0100 @@ -0,0 +1,77 @@ + + + 1 + admin + 10 + + TLocale BC Tests + + + + + + + + + + + + + + makedir + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + execute + + + + + + + + + fetch-log + + + + + + + + + + tlocaletest/winscw_udeb/tlocale.dll + tlocaletest/general/testframework/testframework_tlocale.ini + tlocaletest/general/testframework/tlocale.cfg + + diff -r 980808d9c08e -r 92fa86ed31d8 common/tools/ats/bctest/tstl/tstl.pl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/tools/ats/bctest/tstl/tstl.pl Thu Oct 15 15:59:58 2009 +0100 @@ -0,0 +1,34 @@ +#!/usr/bin/perl +# Copyright (c) 2009 Symbian Foundation Ltd +# This component and the accompanying materials are made available +# under the terms of the License "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Symbian Foundation Ltd - initial contribution. +# +# Contributors: +# Maciej Seroka +# +# Description: +# Script to build ATS test drop for Thread Safe Template Library BC tests + + +use strict; +use File::Copy; +use File::Path; + +unlink "tstltest.zip"; +rmtree "temp"; +mkpath "temp/tstltest/general/testframework"; +mkpath "temp/tstltest/winscw_udeb"; + +my $epoc=$ENV{'EPOCROOT'} . "epoc32/"; +copy("tstl.xml", "temp/test.xml"); + +copy($epoc . "release/winscw/udeb/tstl_1.dll", "temp/tstltest/winscw_udeb/tstl_1.dll") or die "failed : $!"; +copy($epoc . "winscw/c/testframework/testframework_tstl_1.ini", "temp/tstltest/general/testframework/testframework_tstl_1.ini") or die "failed : $!"; +copy($epoc . "winscw/c/testframework/tstl_1.cfg", "temp/tstltest/general/testframework/tstl_1.cfg") or die "failed : $!"; + +system("7z a -tzip tstltest.zip ./temp/*"); diff -r 980808d9c08e -r 92fa86ed31d8 common/tools/ats/bctest/tstl/tstl.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/tools/ats/bctest/tstl/tstl.xml Thu Oct 15 15:59:58 2009 +0100 @@ -0,0 +1,77 @@ + + + 1 + admin + 10 + + Thread Safe Template Library BC Tests + + + + + + + + + + + + + + makedir + + + + + + install + + + + + + + + + install + + + + + + + + + install + + + + + + + + + execute + + + + + + + + + fetch-log + + + + + + + + + + tstltest/winscw_udeb/tstl_1.dll + tstltest/general/testframework/testframework_tstl_1.ini + tstltest/general/testframework/tstl_1.cfg + + diff -r 980808d9c08e -r 92fa86ed31d8 common/tools/populateziptemplate.pl --- a/common/tools/populateziptemplate.pl Thu Oct 15 15:59:16 2009 +0100 +++ b/common/tools/populateziptemplate.pl Thu Oct 15 15:59:58 2009 +0100 @@ -123,12 +123,13 @@ { # RnD repository my $licenseType = $1; - my $name="bin_$1_$2"; + my $binName="bin_$1_$2"; + my $srcName="src_$1_$2"; my $postbuildName = "binaries_$2"; my $config = "rnd"; if ($licenseType eq "internal") { - $name = "binaries_$2_prebuild"; + $binName = "binaries_$2_prebuild"; $config = "rnd-internal"; } @@ -143,11 +144,15 @@ }, { name => "name", - value=> "$name", + value=> "$binName", }, { name => "include", - value=> "/**", + value=> "epoc32/**", + }, + { + name => "include", + value=> "*.txt", }, ] }; @@ -156,10 +161,48 @@ my @files = `dir /b/s/a-d $dosCompatibleDst 2> nul:`; next unless @files; # Add the files to the global list of items to be excluded in the binary zips - @files = grep { + foreach (@files) + { chomp; s{\\}{/}g; s!^[A-Z]:/$package->{dst}/!!i; + } + my @srcFiles = grep { !m{^epoc32/} and !m{^[^/]+\.txt$}i and !m{^\.hg} } @files; + if (@srcFiles) + { + # Create a zip object for the source + push @{$zipConfig->{config}->{config}->{$config}->{config}}, + { + set => + [ + { + name => "root.dir", + value=> "\${build.drive}/$package->{dst}", + }, + { + name => "name", + value=> "$srcName", + }, + { + name => "include", + value=> "**", + }, + { + name => "exclude", + value=> "epoc32/**", + }, + { + name => "exclude", + value=> ".hg/**", + }, + { + name => "exclude", + value=> ".hg_archival.txt", + }, + ] + }; + } + @files = grep { m{^epoc32/}i; } @files; push @allRndFiles, @files;