--- a/commsconfig/commsdatabaseshim/group/BLD.INF Thu Sep 02 21:44:45 2010 +0300
+++ b/commsconfig/commsdatabaseshim/group/BLD.INF Fri Sep 17 08:36:26 2010 +0300
@@ -29,177 +29,105 @@
PRJ_TESTEXPORTS
-../ts_commdb/scripts/default5.dat /epoc32/release/winscw/udeb/z/private/100012a5/dbs_10004e1d_corrupt.dat
-../ts_commdb/scripts/default5.dat /epoc32/release/winscw/urel/z/private/100012a5/dbs_10004e1d_corrupt.dat
-../ts_commdb/scripts/default5.dat /epoc32/data/z/private/100012a5/dbs_10004e1d_corrupt.dat
-
-../group/tcommdb.iby /epoc32/rom/include/tcommdb.iby
-
-// As these test scripts, cdb_urel.script, are used 2 times during our ONB, in order to ensure the uniqueness of the scripts names
-// we need to export them with 2 different names.
+../te_commdb/scripts/default5.dat /epoc32/release/winscw/udeb/z/private/100012a5/dbs_10004e1d_corrupt.dat
+../te_commdb/scripts/default5.dat /epoc32/release/winscw/udeb/z/private/100012a5/dbs_10004e1d_corrupt.dat
+../te_commdb/scripts/default5.dat /epoc32/release/winscw/urel/z/private/100012a5/dbs_10004e1d_corrupt.dat
-../ts_commdb/scripts/cdb_urel.script /epoc32/release/wins/udeb/z/testdata/scripts/cdb_urel.script
-../ts_commdb/scripts/cdb_urel.script /epoc32/release/wins/udeb/z/testdata/scripts/cdb_urel1.script
-../ts_commdb/scripts/Default1.xml /epoc32/release/wins/udeb/z/testdata/configs/default1.xml
-../ts_commdb/scripts/default3.xml /epoc32/release/wins/udeb/z/testdata/configs/default3.xml
-../ts_commdb/scripts/default5.dat /epoc32/release/wins/udeb/z/testdata/configs/default5.dat
-../ts_commdb/scripts/Default7.xml /epoc32/release/wins/udeb/z/testdata/configs/default7.xml
-../ts_commdb/scripts/Default.xml /epoc32/release/wins/udeb/z/testdata/configs/default.xml
-../ts_commdb/scripts/Corrupt.xml /epoc32/release/wins/udeb/z/testdata/configs/corrupt.xml
-../ts_commdb/scripts/020.xml /epoc32/release/wins/udeb/z/testdata/configs/020.xml
-../ts_commdb/scripts/021.xml /epoc32/release/wins/udeb/z/testdata/configs/021.xml
-../ts_commdb/scripts/022.xml /epoc32/release/wins/udeb/z/testdata/configs/022.xml
-../ts_commdb/scripts/022_30.xml /epoc32/release/wins/udeb/z/testdata/configs/022_30.xml
-../ts_commdb/scripts/023.xml /epoc32/release/wins/udeb/z/testdata/configs/023.xml
-../ts_commdb/scripts/024.xml /epoc32/release/wins/udeb/z/testdata/configs/024.xml
-../ts_commdb/scripts/061_01.xml /epoc32/release/wins/udeb/z/testdata/configs/061_01.xml
-../ts_commdb/scripts/061_02.xml /epoc32/release/wins/udeb/z/testdata/configs/061_02.xml
-../ts_commdb/scripts/061_03.xml /epoc32/release/wins/udeb/z/testdata/configs/061_03.xml
-../ts_commdb/scripts/061_04.xml /epoc32/release/wins/udeb/z/testdata/configs/061_04.xml
-../ts_commdb/scripts/064_01.cfg /epoc32/release/wins/udeb/z/testdata/configs/064_01.cfg
+../group/te_tcommdb.iby /epoc32/rom/include/te_tcommdb.iby
-../ts_commdb/scripts/cdb_urel.script /epoc32/release/wins/urel/z/testdata/scripts/cdb_urel.script
-../ts_commdb/scripts/cdb_urel.script /epoc32/release/wins/urel/z/testdata/scripts/cdb_urel1.script
-../ts_commdb/scripts/Default1.xml /epoc32/release/wins/urel/z/testdata/configs/default1.xml
-../ts_commdb/scripts/default3.xml /epoc32/release/wins/urel/z/testdata/configs/default3.xml
-../ts_commdb/scripts/default5.dat /epoc32/release/wins/urel/z/testdata/configs/default5.dat
-../ts_commdb/scripts/Default7.xml /epoc32/release/wins/urel/z/testdata/configs/default7.xml
-../ts_commdb/scripts/Default.xml /epoc32/release/wins/urel/z/testdata/configs/default.xml
-../ts_commdb/scripts/Corrupt.xml /epoc32/release/wins/urel/z/testdata/configs/corrupt.xml
-../ts_commdb/scripts/020.xml /epoc32/release/wins/urel/z/testdata/configs/020.xml
-../ts_commdb/scripts/021.xml /epoc32/release/wins/urel/z/testdata/configs/021.xml
-../ts_commdb/scripts/022.xml /epoc32/release/wins/urel/z/testdata/configs/022.xml
-../ts_commdb/scripts/022_30.xml /epoc32/release/wins/urel/z/testdata/configs/022_30.xml
-../ts_commdb/scripts/023.xml /epoc32/release/wins/urel/z/testdata/configs/023.xml
-../ts_commdb/scripts/024.xml /epoc32/release/wins/urel/z/testdata/configs/024.xml
-../ts_commdb/scripts/061_01.xml /epoc32/release/wins/urel/z/testdata/configs/061_01.xml
-../ts_commdb/scripts/061_02.xml /epoc32/release/wins/urel/z/testdata/configs/061_02.xml
-../ts_commdb/scripts/061_03.xml /epoc32/release/wins/urel/z/testdata/configs/061_03.xml
-../ts_commdb/scripts/061_04.xml /epoc32/release/wins/urel/z/testdata/configs/061_04.xml
-../ts_commdb/scripts/064_01.cfg /epoc32/release/wins/urel/z/testdata/configs/064_01.cfg
+../te_commdb/scripts/te_cdb_urel.script /epoc32/release/winscw/udeb/z/testdata/scripts/te_cdb_urel.script
+../te_commdb/scripts/Default1.xml /epoc32/release/winscw/udeb/z/testdata/configs/default1.xml
+../te_commdb/scripts/default3.xml /epoc32/release/winscw/udeb/z/testdata/configs/default3.xml
+../te_commdb/scripts/default5.dat /epoc32/release/winscw/udeb/z/testdata/configs/default5.dat
+../te_commdb/scripts/Default7.xml /epoc32/release/winscw/udeb/z/testdata/configs/default7.xml
+../te_commdb/scripts/Default.xml /epoc32/release/winscw/udeb/z/testdata/configs/default.xml
+../te_commdb/scripts/Corrupt.xml /epoc32/release/winscw/udeb/z/testdata/configs/corrupt.xml
+../te_commdb/scripts/020.xml /epoc32/release/winscw/udeb/z/testdata/configs/020.xml
+../te_commdb/scripts/021.xml /epoc32/release/winscw/udeb/z/testdata/configs/021.xml
+../te_commdb/scripts/022.xml /epoc32/release/winscw/udeb/z/testdata/configs/022.xml
+../te_commdb/scripts/022_30.xml /epoc32/release/winscw/udeb/z/testdata/configs/022_30.xml
+../te_commdb/scripts/023.xml /epoc32/release/winscw/udeb/z/testdata/configs/023.xml
+../te_commdb/scripts/024.xml /epoc32/release/winscw/udeb/z/testdata/configs/024.xml
+../te_commdb/scripts/061_01.xml /epoc32/release/winscw/udeb/z/testdata/configs/061_01.xml
+../te_commdb/scripts/061_02.xml /epoc32/release/winscw/udeb/z/testdata/configs/061_02.xml
+../te_commdb/scripts/061_03.xml /epoc32/release/winscw/udeb/z/testdata/configs/061_03.xml
+../te_commdb/scripts/061_04.xml /epoc32/release/winscw/udeb/z/testdata/configs/061_04.xml
+../te_commdb/scripts/064_01.cfg /epoc32/release/winscw/udeb/z/testdata/configs/064_01.cfg
-../ts_commdb/scripts/cdb_urel.script /epoc32/release/winscw/udeb/z/testdata/scripts/cdb_urel.script
-../ts_commdb/scripts/cdb_urel.script /epoc32/release/winscw/udeb/z/testdata/scripts/cdb_urel1.script
-../ts_commdb/scripts/Default1.xml /epoc32/release/winscw/udeb/z/testdata/configs/default1.xml
-../ts_commdb/scripts/default3.xml /epoc32/release/winscw/udeb/z/testdata/configs/default3.xml
-../ts_commdb/scripts/default5.dat /epoc32/release/winscw/udeb/z/testdata/configs/default5.dat
-../ts_commdb/scripts/Default7.xml /epoc32/release/winscw/udeb/z/testdata/configs/default7.xml
-../ts_commdb/scripts/Default.xml /epoc32/release/winscw/udeb/z/testdata/configs/default.xml
-../ts_commdb/scripts/Corrupt.xml /epoc32/release/winscw/udeb/z/testdata/configs/corrupt.xml
-../ts_commdb/scripts/020.xml /epoc32/release/winscw/udeb/z/testdata/configs/020.xml
-../ts_commdb/scripts/021.xml /epoc32/release/winscw/udeb/z/testdata/configs/021.xml
-../ts_commdb/scripts/022.xml /epoc32/release/winscw/udeb/z/testdata/configs/022.xml
-../ts_commdb/scripts/022_30.xml /epoc32/release/winscw/udeb/z/testdata/configs/022_30.xml
-../ts_commdb/scripts/023.xml /epoc32/release/winscw/udeb/z/testdata/configs/023.xml
-../ts_commdb/scripts/024.xml /epoc32/release/winscw/udeb/z/testdata/configs/024.xml
-../ts_commdb/scripts/061_01.xml /epoc32/release/winscw/udeb/z/testdata/configs/061_01.xml
-../ts_commdb/scripts/061_02.xml /epoc32/release/winscw/udeb/z/testdata/configs/061_02.xml
-../ts_commdb/scripts/061_03.xml /epoc32/release/winscw/udeb/z/testdata/configs/061_03.xml
-../ts_commdb/scripts/061_04.xml /epoc32/release/winscw/udeb/z/testdata/configs/061_04.xml
-../ts_commdb/scripts/064_01.cfg /epoc32/release/winscw/udeb/z/testdata/configs/064_01.cfg
-
-../ts_commdb/scripts/cdb_urel.script /epoc32/release/winscw/urel/z/testdata/scripts/cdb_urel.script
-../ts_commdb/scripts/cdb_urel.script /epoc32/release/winscw/urel/z/testdata/scripts/cdb_urel1.script
-../ts_commdb/scripts/Default1.xml /epoc32/release/winscw/urel/z/testdata/configs/default1.xml
-../ts_commdb/scripts/default3.xml /epoc32/release/winscw/urel/z/testdata/configs/default3.xml
-../ts_commdb/scripts/default5.dat /epoc32/release/winscw/urel/z/testdata/configs/default5.dat
-../ts_commdb/scripts/Default7.xml /epoc32/release/winscw/urel/z/testdata/configs/default7.xml
-../ts_commdb/scripts/Default.xml /epoc32/release/winscw/urel/z/testdata/configs/default.xml
-../ts_commdb/scripts/Corrupt.xml /epoc32/release/winscw/urel/z/testdata/configs/corrupt.xml
-../ts_commdb/scripts/020.xml /epoc32/release/winscw/urel/z/testdata/configs/020.xml
-../ts_commdb/scripts/021.xml /epoc32/release/winscw/urel/z/testdata/configs/021.xml
-../ts_commdb/scripts/022.xml /epoc32/release/winscw/urel/z/testdata/configs/022.xml
-../ts_commdb/scripts/022_30.xml /epoc32/release/winscw/urel/z/testdata/configs/022_30.xml
-../ts_commdb/scripts/023.xml /epoc32/release/winscw/urel/z/testdata/configs/023.xml
-../ts_commdb/scripts/024.xml /epoc32/release/winscw/urel/z/testdata/configs/024.xml
-../ts_commdb/scripts/061_01.xml /epoc32/release/winscw/urel/z/testdata/configs/061_01.xml
-../ts_commdb/scripts/061_02.xml /epoc32/release/winscw/urel/z/testdata/configs/061_02.xml
-../ts_commdb/scripts/061_03.xml /epoc32/release/winscw/urel/z/testdata/configs/061_03.xml
-../ts_commdb/scripts/061_04.xml /epoc32/release/winscw/urel/z/testdata/configs/061_04.xml
-../ts_commdb/scripts/064_01.cfg /epoc32/release/winscw/urel/z/testdata/configs/064_01.cfg
-
+../te_commdb/scripts/te_cdb_urel.script /epoc32/release/winscw/urel/z/testdata/scripts/te_cdb_urel.script
+../te_commdb/scripts/Default1.xml /epoc32/release/winscw/urel/z/testdata/configs/default1.xml
+../te_commdb/scripts/default3.xml /epoc32/release/winscw/urel/z/testdata/configs/default3.xml
+../te_commdb/scripts/default5.dat /epoc32/release/winscw/urel/z/testdata/configs/default5.dat
+../te_commdb/scripts/Default7.xml /epoc32/release/winscw/urel/z/testdata/configs/default7.xml
+../te_commdb/scripts/Default.xml /epoc32/release/winscw/urel/z/testdata/configs/default.xml
+../te_commdb/scripts/Corrupt.xml /epoc32/release/winscw/urel/z/testdata/configs/corrupt.xml
+../te_commdb/scripts/020.xml /epoc32/release/winscw/urel/z/testdata/configs/020.xml
+../te_commdb/scripts/021.xml /epoc32/release/winscw/urel/z/testdata/configs/021.xml
+../te_commdb/scripts/022.xml /epoc32/release/winscw/urel/z/testdata/configs/022.xml
+../te_commdb/scripts/022_30.xml /epoc32/release/winscw/urel/z/testdata/configs/022_30.xml
+../te_commdb/scripts/023.xml /epoc32/release/winscw/urel/z/testdata/configs/023.xml
+../te_commdb/scripts/024.xml /epoc32/release/winscw/urel/z/testdata/configs/024.xml
+../te_commdb/scripts/061_01.xml /epoc32/release/winscw/urel/z/testdata/configs/061_01.xml
+../te_commdb/scripts/061_02.xml /epoc32/release/winscw/urel/z/testdata/configs/061_02.xml
+../te_commdb/scripts/061_03.xml /epoc32/release/winscw/urel/z/testdata/configs/061_03.xml
+../te_commdb/scripts/061_04.xml /epoc32/release/winscw/urel/z/testdata/configs/061_04.xml
+../te_commdb/scripts/064_01.cfg /epoc32/release/winscw/urel/z/testdata/configs/064_01.cfg
//Protection tests
-../ts_commdb/scripts/ProtectTable-Normal.script /epoc32/release/wins/urel/z/testdata/scripts/protecttable-normal.script
-../ts_commdb/scripts/ProtectRecord-Normal.script /epoc32/release/wins/urel/z/testdata/scripts/protectrecord-normal.script
-../ts_commdb/scripts/ProtectTable-ConnPref.script /epoc32/release/wins/urel/z/testdata/scripts/protecttable-connpref.script
-../ts_commdb/scripts/ProtectRecord-ConnPref.script /epoc32/release/wins/urel/z/testdata/scripts/protectrecord-connpref.script
-../ts_commdb/scripts/TestProtectTable-Normal.script /epoc32/release/wins/urel/z/testdata/scripts/testprotecttable-normal.script
-../ts_commdb/scripts/TestProtectRecord-Normal.script /epoc32/release/wins/urel/z/testdata/scripts/testprotectrecord-normal.script
-../ts_commdb/scripts/TestProtectTable-ConnPref.script /epoc32/release/wins/urel/z/testdata/scripts/testprotecttable-connpref.script
-../ts_commdb/scripts/TestProtectRecord-ConnPref.script /epoc32/release/wins/urel/z/testdata/scripts/testprotectrecord-connpref.script
-../ts_commdb/scripts/Test_Both_Types.script /epoc32/release/wins/urel/z/testdata/scripts/test_both_types.script
-../ts_commdb/scripts/CombinationalTest.script /epoc32/release/wins/urel/z/testdata/scripts/combinationaltest.script
-../ts_commdb/scripts/PanicTest.script /epoc32/release/wins/urel/z/testdata/scripts/panictest.script
-../ts_commdb/scripts/protect.xml /epoc32/release/wins/urel/z/testdata/configs/protect.xml
-
-../ts_commdb/scripts/ProtectTable-Normal.script /epoc32/release/wins/udeb/z/testdata/scripts/protecttable-normal.script
-../ts_commdb/scripts/ProtectRecord-Normal.script /epoc32/release/wins/udeb/z/testdata/scripts/protectrecord-normal.script
-../ts_commdb/scripts/ProtectTable-ConnPref.script /epoc32/release/wins/udeb/z/testdata/scripts/protecttable-connpref.script
-../ts_commdb/scripts/ProtectRecord-ConnPref.script /epoc32/release/wins/udeb/z/testdata/scripts/protectrecord-connpref.script
-../ts_commdb/scripts/TestProtectTable-Normal.script /epoc32/release/wins/udeb/z/testdata/scripts/testprotecttable-normal.script
-../ts_commdb/scripts/TestProtectRecord-Normal.script /epoc32/release/wins/udeb/z/testdata/scripts/testprotectrecord-normal.script
-../ts_commdb/scripts/TestProtectTable-ConnPref.script /epoc32/release/wins/udeb/z/testdata/scripts/testprotecttable-connpref.script
-../ts_commdb/scripts/TestProtectRecord-ConnPref.script /epoc32/release/wins/udeb/z/testdata/scripts/testprotectrecord-connpref.script
-../ts_commdb/scripts/Test_Both_Types.script /epoc32/release/wins/udeb/z/testdata/scripts/test_both_types.script
-../ts_commdb/scripts/CombinationalTest.script /epoc32/release/wins/udeb/z/testdata/scripts/combinationaltest.script
-../ts_commdb/scripts/PanicTest.script /epoc32/release/wins/udeb/z/testdata/scripts/panictest.script
-../ts_commdb/scripts/protect.xml /epoc32/release/wins/udeb/z/testdata/configs/protect.xml
+../te_commdb/scripts/ProtectTable-Normal.script /epoc32/release/winscw/udeb/z/testdata/scripts/protecttable-normal.script
+../te_commdb/scripts/ProtectRecord-Normal.script /epoc32/release/winscw/udeb/z/testdata/scripts/protectrecord-normal.script
+../te_commdb/scripts/ProtectTable-ConnPref.script /epoc32/release/winscw/udeb/z/testdata/scripts/protecttable-connpref.script
+../te_commdb/scripts/ProtectRecord-ConnPref.script /epoc32/release/winscw/udeb/z/testdata/scripts/protectrecord-connpref.script
+../te_commdb/scripts/TestProtectTable-Normal.script /epoc32/release/winscw/udeb/z/testdata/scripts/testprotecttable-normal.script
+../te_commdb/scripts/TestProtectRecord-Normal.script /epoc32/release/winscw/udeb/z/testdata/scripts/testprotectrecord-normal.script
+../te_commdb/scripts/TestProtectTable-ConnPref.script /epoc32/release/winscw/udeb/z/testdata/scripts/testprotecttable-connpref.script
+../te_commdb/scripts/TestProtectRecord-ConnPref.script /epoc32/release/winscw/udeb/z/testdata/scripts/testprotectrecord-connpref.script
+../te_commdb/scripts/Test_Both_Types.script /epoc32/release/winscw/udeb/z/testdata/scripts/test_both_types.script
+../te_commdb/scripts/CombinationalTest.script /epoc32/release/winscw/udeb/z/testdata/scripts/combinationaltest.script
+../te_commdb/scripts/PanicTest.script /epoc32/release/winscw/udeb/z/testdata/scripts/panictest.script
+../te_commdb/scripts/te_connpref.script /epoc32/release/winscw/udeb/z/testdata/scripts/te_connpref.script
+../te_commdb/scripts/te_encrpt.script /epoc32/release/winscw/udeb/z/testdata/scripts/te_encrpt.script
+../te_commdb/scripts/te_usecases.script /epoc32/release/winscw/udeb/z/testdata/scripts/te_usecases.script
+../te_commdb/scripts/protect.xml /epoc32/release/winscw/udeb/z/testdata/configs/protect.xml
-../ts_commdb/scripts/ProtectTable-Normal.script /epoc32/release/winscw/urel/z/testdata/scripts/protecttable-normal.script
-../ts_commdb/scripts/ProtectRecord-Normal.script /epoc32/release/winscw/urel/z/testdata/scripts/protectrecord-normal.script
-../ts_commdb/scripts/ProtectTable-ConnPref.script /epoc32/release/winscw/urel/z/testdata/scripts/protecttable-connpref.script
-../ts_commdb/scripts/ProtectRecord-ConnPref.script /epoc32/release/winscw/urel/z/testdata/scripts/protectrecord-connpref.script
-../ts_commdb/scripts/TestProtectTable-Normal.script /epoc32/release/winscw/urel/z/testdata/scripts/testprotecttable-normal.script
-../ts_commdb/scripts/TestProtectRecord-Normal.script /epoc32/release/winscw/urel/z/testdata/scripts/testprotectrecord-normal.script
-../ts_commdb/scripts/TestProtectTable-ConnPref.script /epoc32/release/winscw/urel/z/testdata/scripts/testprotecttable-connpref.script
-../ts_commdb/scripts/TestProtectRecord-ConnPref.script /epoc32/release/winscw/urel/z/testdata/scripts/testprotectrecord-connpref.script
-../ts_commdb/scripts/Test_Both_Types.script /epoc32/release/winscw/urel/z/testdata/scripts/test_both_types.script
-../ts_commdb/scripts/CombinationalTest.script /epoc32/release/winscw/urel/z/testdata/scripts/combinationaltest.script
-../ts_commdb/scripts/PanicTest.script /epoc32/release/winscw/urel/z/testdata/scripts/panictest.script
-../ts_commdb/scripts/protect.xml /epoc32/release/winscw/urel/z/testdata/configs/protect.xml
-
-../ts_commdb/scripts/ProtectTable-Normal.script /epoc32/release/winscw/udeb/z/testdata/scripts/protecttable-normal.script
-../ts_commdb/scripts/ProtectRecord-Normal.script /epoc32/release/winscw/udeb/z/testdata/scripts/protectrecord-normal.script
-../ts_commdb/scripts/ProtectTable-ConnPref.script /epoc32/release/winscw/udeb/z/testdata/scripts/protecttable-connpref.script
-../ts_commdb/scripts/ProtectRecord-ConnPref.script /epoc32/release/winscw/udeb/z/testdata/scripts/protectrecord-connpref.script
-../ts_commdb/scripts/TestProtectTable-Normal.script /epoc32/release/winscw/udeb/z/testdata/scripts/testprotecttable-normal.script
-../ts_commdb/scripts/TestProtectRecord-Normal.script /epoc32/release/winscw/udeb/z/testdata/scripts/testprotectrecord-normal.script
-../ts_commdb/scripts/TestProtectTable-ConnPref.script /epoc32/release/winscw/udeb/z/testdata/scripts/testprotecttable-connpref.script
-../ts_commdb/scripts/TestProtectRecord-ConnPref.script /epoc32/release/winscw/udeb/z/testdata/scripts/testprotectrecord-connpref.script
-../ts_commdb/scripts/Test_Both_Types.script /epoc32/release/winscw/udeb/z/testdata/scripts/test_both_types.script
-../ts_commdb/scripts/CombinationalTest.script /epoc32/release/winscw/udeb/z/testdata/scripts/combinationaltest.script
-../ts_commdb/scripts/PanicTest.script /epoc32/release/winscw/udeb/z/testdata/scripts/panictest.script
-../ts_commdb/scripts/protect.xml /epoc32/release/winscw/udeb/z/testdata/configs/protect.xml
+../te_commdb/scripts/ProtectTable-Normal.script /epoc32/release/winscw/urel/z/testdata/scripts/protecttable-normal.script
+../te_commdb/scripts/ProtectRecord-Normal.script /epoc32/release/winscw/urel/z/testdata/scripts/protectrecord-normal.script
+../te_commdb/scripts/ProtectTable-ConnPref.script /epoc32/release/winscw/urel/z/testdata/scripts/protecttable-connpref.script
+../te_commdb/scripts/ProtectRecord-ConnPref.script /epoc32/release/winscw/urel/z/testdata/scripts/protectrecord-connpref.script
+../te_commdb/scripts/TestProtectTable-Normal.script /epoc32/release/winscw/urel/z/testdata/scripts/testprotecttable-normal.script
+../te_commdb/scripts/TestProtectRecord-Normal.script /epoc32/release/winscw/urel/z/testdata/scripts/testprotectrecord-normal.script
+../te_commdb/scripts/TestProtectTable-ConnPref.script /epoc32/release/winscw/urel/z/testdata/scripts/testprotecttable-connpref.script
+../te_commdb/scripts/TestProtectRecord-ConnPref.script /epoc32/release/winscw/urel/z/testdata/scripts/testprotectrecord-connpref.script
+../te_commdb/scripts/Test_Both_Types.script /epoc32/release/winscw/urel/z/testdata/scripts/test_both_types.script
+../te_commdb/scripts/CombinationalTest.script /epoc32/release/winscw/urel/z/testdata/scripts/combinationaltest.script
+../te_commdb/scripts/PanicTest.script /epoc32/release/winscw/urel/z/testdata/scripts/panictest.script
+../te_commdb/scripts/te_connpref.script /epoc32/release/winscw/urel/z/testdata/scripts/te_connpref.script
+../te_commdb/scripts/te_encrpt.script /epoc32/release/winscw/urel/z/testdata/scripts/te_encrpt.script
+../te_commdb/scripts/te_usecases.script /epoc32/release/winscw/urel/z/testdata/scripts/te_usecases.script
+../te_commdb/scripts/protect.xml /epoc32/release/winscw/urel/z/testdata/configs/protect.xml
// Different test script files for CommsDat and non-CommsDat tests
-../ts_commdb/scripts/Cdb_udeb.script /epoc32/release/wins/udeb/z/testdata/scripts/cdb_udeb.script
-../ts_commdb/scripts/Cdb_udeb.script /epoc32/release/wins/urel/z/testdata/scripts/cdb_udeb.script
-../ts_commdb/scripts/Cdb_udeb.script /epoc32/release/winscw/udeb/z/testdata/scripts/cdb_udeb.script
-../ts_commdb/scripts/Cdb_udeb.script /epoc32/release/winscw/urel/z/testdata/scripts/cdb_udeb.script
+../te_commdb/scripts/te_cdb_udeb.script /epoc32/release/winscw/udeb/z/testdata/scripts/te_cdb_udeb.script
-// As these test scripts, cdb_udeb.script, are used 2 times during our ONB, in order to ensure the uniqueness of the scripts names
-// we need to export them with 2 different names.
+../te_commdb/scripts/te_cdb_udeb.script /epoc32/release/winscw/urel/z/testdata/scripts/te_cdb_udeb.script
+
+../te_commdb/scripts/Test_All_Protection.script /epoc32/release/winscw/udeb/z/testdata/scripts/test_all_protection.script
-../ts_commdb/scripts/Cdb_udeb.script /epoc32/release/wins/udeb/z/testdata/scripts/cdb_udeb1.script
-../ts_commdb/scripts/Cdb_udeb.script /epoc32/release/wins/urel/z/testdata/scripts/cdb_udeb1.script
-../ts_commdb/scripts/Cdb_udeb.script /epoc32/release/winscw/udeb/z/testdata/scripts/cdb_udeb1.script
-../ts_commdb/scripts/Cdb_udeb.script /epoc32/release/winscw/urel/z/testdata/scripts/cdb_udeb1.script
+../te_commdb/scripts/Test_All_Protection.script /epoc32/release/winscw/urel/z/testdata/scripts/test_all_protection.script
-../ts_commdb/scripts/Test_All_Protection.script /epoc32/release/wins/urel/z/testdata/scripts/test_all_protection.script
-../ts_commdb/scripts/Test_All_Protection.script /epoc32/release/wins/udeb/z/testdata/scripts/test_all_protection.script
-../ts_commdb/scripts/Test_All_Protection.script /epoc32/release/winscw/urel/z/testdata/scripts/test_all_protection.script
-../ts_commdb/scripts/Test_All_Protection.script /epoc32/release/winscw/udeb/z/testdata/scripts/test_all_protection.script
+//Exports for the ReadOnly test suites - for winscw
+../te_commdb/scripts/te_cdb_udeb.script /epoc32/release/winscw/udeb/z/testdata/scripts/te_cdb_udeb_rohid_ced.script
+
+../te_commdb/scripts/te_cdb_udeb.script /epoc32/release/winscw/urel/z/testdata/scripts/te_cdb_udeb_rohid_ced.script
PRJ_MMPFILES
PRJ_TESTMMPFILES
-
-../ts_commdb/Ts_commdb.mmp
-../ts_commdb/ts_connpref.mmp
-../ts_commdb/ts_encrpt.mmp
-../ts_commdb/ts_usecases.mmp
+../TE_commdb/group/TE_commdb.mmp
+../TE_commdb/TE_connpref/group/TE_connpref.mmp
+../TE_commdb/TE_encrpt/group/TE_encrpt.mmp
+../TE_commdb/TE_usecases/group/TE_usecases.mmp