Revision: 201041 RCL_3 PDK_3.0.4
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Wed, 13 Oct 2010 16:30:44 +0300
branchRCL_3
changeset 56 839ea9debada
parent 50 8dc8494f1e0e
Revision: 201041 Kit: 201041
loggingservices/eventlogger/LogServ/LOGSERV.RSS
loggingservices/eventlogger/LogServ/src/LogServResourceInterpreter.cpp
loggingservices/eventlogger/LogWrap/inc/LOGWRAPLIMITS.H
loggingservices/eventlogger/Rom/logengtest.iby
loggingservices/eventlogger/conf/eventlogger.confml
loggingservices/eventlogger/group/BLD.INF
loggingservices/eventlogger/group/logserv.mmp
loggingservices/eventlogger/test/src/t_logapi.cpp
loggingservices/eventlogger/test/src/t_logcntmatch.cpp
loggingservices/eventlogger/test/src/t_logservercrash.cpp
loggingservices/eventlogger/test/src/t_logview1.cpp
loggingservices/eventlogger/test/t_logapi.mmp
loggingservices/eventlogger/test/t_logcntmatch.mmp
loggingservices/eventlogger/test/t_loghicaphelper.mmp
persistentstorage/dbms/group/BLD.INF
persistentstorage/dbms/group/DBMSTests.iby
persistentstorage/dbms/tdbms/U_SCRIPT.TXT
persistentstorage/sql/GROUP/BLD.INF
persistentstorage/sql/GROUP/sqltests.bat
persistentstorage/sql/GROUP/sqltests.iby
persistentstorage/sql/SQLite/pager.c
persistentstorage/sql/SRC/Server/Compact/SqlCompactEntry.cpp
persistentstorage/sql/SRC/Server/SqlBur.cpp
persistentstorage/sql/SRC/Server/SqlSrvResourceProfiler.cpp
persistentstorage/sql/SRC/Server/SqlSrvStatement.inl
persistentstorage/sql/TEST/t_sqlcompact2.cpp
persistentstorage/sql/TEST/t_sqldefect2.cpp
persistentstorage/sql/TEST/t_sqlload.cpp
persistentstorage/sql/TEST/t_sqloslayer.cpp
persistentstorage/sql/TEST/t_sqlperformance.cpp
persistentstorage/sql/TEST/t_sqlperformance4.cpp
persistentstorage/sql/TEST/t_sqlperformance5.cpp
persistentstorage/sqlite3api/GROUP/BLD.INF
persistentstorage/sqlite3api/GROUP/sqlite3tests.bat
persistentstorage/sqlite3api/GROUP/sqlite3tests.iby
persistentstorage/sqlite3api/GROUP/t_sqliteapi.mmp
persistentstorage/sqlite3api/TEST/TclScript/all.test
persistentstorage/sqlite3api/TEST/t_sqliteapi.c
persistentstorage/sqlite3api/TEST/t_sqliteapi.txt
persistentstorage/store/INC/S32FILE.INL
persistentstorage/store/ROM/StoreTests.IBY
traceservices/tracefw/ulogger/src/sysconfig/configfilemanager.cpp
traceservices/tracefw/ulogger/src/uloggerserver/uloggerserver.cpp
traceservices/tracefw/ulogger/unit_test/group/bld.inf
traceservices/tracefw/ulogger/unit_test/group/te_client.mmp
traceservices/tracefw/ulogger/unit_test/group/te_createconfig.mmp
traceservices/tracefw/ulogger/unit_test/group/te_file.mmp
traceservices/tracefw/ulogger/unit_test/group/te_outfrwk.mmp
traceservices/tracefw/ulogger/unit_test/group/te_serial.mmp
traceservices/tracefw/ulogger/unit_test/group/te_server.mmp
traceservices/tracefw/ulogger/unit_test/group/te_sysconfig.mmp
traceservices/tracefw/ulogger/unit_test/group/te_sysstart.mmp
traceservices/tracefw/ulogger/unit_test/te-client/te_uloggerclientsuiteserver.h
traceservices/tracefw/ulogger/unit_test/te-client/te_uloggerclientsuitestepbase.h
traceservices/tracefw/ulogger/unit_test/te-client/testconnectstep.h
traceservices/tracefw/ulogger/unit_test/te-client/testdeactivateoutputpluginstep.h
traceservices/tracefw/ulogger/unit_test/te-client/testgetprimaryfilterslstep.h
traceservices/tracefw/ulogger/unit_test/te-client/testgetsecondaryfilterslstep.h
traceservices/tracefw/ulogger/unit_test/te-client/testgettracebuffersizestep.h
traceservices/tracefw/ulogger/unit_test/te-client/testremoveprimaryfltstep.h
traceservices/tracefw/ulogger/unit_test/te-client/testresizetracebuffersizestep.h
traceservices/tracefw/ulogger/unit_test/te-client/testruloggerapi_ext.h
traceservices/tracefw/ulogger/unit_test/te-client/testsetdatanotificationsizestep.h
traceservices/tracefw/ulogger/unit_test/te-client/testsetprimaryfltstep.h
traceservices/tracefw/ulogger/unit_test/te-client/testsetsecondaryfilterallstep.h
traceservices/tracefw/ulogger/unit_test/te-client/testsetsecondaryfltstep.h
traceservices/tracefw/ulogger/unit_test/te-client/teststartstep.h
traceservices/tracefw/ulogger/unit_test/te-client/teststopstep.h
traceservices/tracefw/ulogger/unit_test/te-client/testtracebuffermodestep.h
traceservices/tracefw/ulogger/unit_test/te-client/testversionstep.h
traceservices/tracefw/ulogger/unit_test/te-createconfig/te_createconfigemptystep.h
traceservices/tracefw/ulogger/unit_test/te-createconfig/te_createconfigfullstep.h
traceservices/tracefw/ulogger/unit_test/te-createconfig/te_createconfigserver.h
traceservices/tracefw/ulogger/unit_test/te-outfrwk/te_outfrwk_testserver.h
traceservices/tracefw/ulogger/unit_test/te-outfrwk/te_outfrwk_teststep.h
traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-file/te_filesuiteserver.h
traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-file/te_filesuitestepbase.h
traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-file/uloggerfileplugintest.h
traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-serial/te_serialsuiteserver.h
traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-serial/te_serialsuitestepbase.h
traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-serial/uloggerserialplugintest.h
traceservices/tracefw/ulogger/unit_test/te-server/te_uloggerservertestsuiteserver.h
traceservices/tracefw/ulogger/unit_test/te-server/te_uloggerservertestsuitestepbase.h
traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest0step.h
traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest1step.h
traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest2step.h
traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest3step.h
traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest4step.h
traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest5step.h
traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest6step.h
traceservices/tracefw/ulogger/unit_test/te-sysconfig/te_test_syscfgserver.h
traceservices/tracefw/ulogger/unit_test/te-sysconfig/te_test_syscfgstep.h
traceservices/tracefw/ulogger/unit_test/te-sysstart/te_sysstartersuiteserver.h
traceservices/tracefw/ulogger/unit_test/te-sysstart/te_sysstartersuitestepbase.h
traceservices/tracefw/ulogger/unit_test/te-sysstart/uloggersysstarttest.h
--- a/loggingservices/eventlogger/LogServ/LOGSERV.RSS	Wed Sep 15 14:05:58 2010 +0300
+++ b/loggingservices/eventlogger/LogServ/LOGSERV.RSS	Wed Oct 13 16:30:44 2010 +0300
@@ -49,7 +49,5 @@
 //
 // By default r_log_contact_name_format value is set to r_western_format.
 // It has to be set to r_chinese_format for chinese builds.
-// The default value is kept here for compatibility reasons. The resource file is not used anymore.
-// The related LogServ confml file is used for loading the default contact name format.
 RESOURCE INT16 r_log_contact_name_format { value = r_western_format; }
 
--- a/loggingservices/eventlogger/LogServ/src/LogServResourceInterpreter.cpp	Wed Sep 15 14:05:58 2010 +0300
+++ b/loggingservices/eventlogger/LogServ/src/LogServResourceInterpreter.cpp	Wed Oct 13 16:30:44 2010 +0300
@@ -133,12 +133,17 @@
 	// Check the entry exists on this drive (e.g. if we are running the log server
 	// from RAM, then default to the ROM if no RSC on the current drive exists).
 	TEntry fsEntry;
-	if	(iFsSession.Entry(fileName, fsEntry) == KErrNotFound)
+	TInt err = iFsSession.Entry(fileName, fsEntry);
+	if	(err == KErrNotFound || err == KErrPathNotFound)
 		{
 		// Switch to ROM (we might already have been launching from the ROM,
 		// in which case this will have no effect anyway).
 		fileName[0] = 'Z';
 		}
+	else
+		{
+		User::LeaveIfError(err);
+		}
 
 	// Open resource file
 	TResourceFileEntry entry;
--- a/loggingservices/eventlogger/LogWrap/inc/LOGWRAPLIMITS.H	Wed Sep 15 14:05:58 2010 +0300
+++ b/loggingservices/eventlogger/LogWrap/inc/LOGWRAPLIMITS.H	Wed Oct 13 16:30:44 2010 +0300
@@ -21,7 +21,7 @@
 
 /**
 String lengths
-@publishedAll
+@publishedPartner
 @released
 */
 const TInt KLogMaxRemotePartyLength = 64;
@@ -34,7 +34,7 @@
 
 /**
 Limits
-@publishedAll
+@publishedPartner
 @released
 */
    
--- a/loggingservices/eventlogger/Rom/logengtest.iby	Wed Sep 15 14:05:58 2010 +0300
+++ b/loggingservices/eventlogger/Rom/logengtest.iby	Wed Oct 13 16:30:44 2010 +0300
@@ -27,48 +27,49 @@
 
 ECOM_PLUGIN(t_logcntmatchplugin.dll,2000862e.rsc)
 
-file=ABI_DIR\BUILD_DIR\t_logtype.exe            test\t_logtype.exe
-file=ABI_DIR\BUILD_DIR\t_logapi.exe             test\t_logapi.exe
-file=ABI_DIR\BUILD_DIR\t_logapi2.exe            test\t_logapi2.exe
-file=ABI_DIR\BUILD_DIR\t_logbadclient.exe       test\t_logbadclient.exe
-file=ABI_DIR\BUILD_DIR\t_logview1.exe           test\t_logview1.exe
-file=ABI_DIR\BUILD_DIR\t_logpurge.exe           test\t_logpurge.exe
-file=ABI_DIR\BUILD_DIR\t_logheap.exe            test\t_logheap.exe
-file=ABI_DIR\BUILD_DIR\t_logfile.exe            test\t_logfile.exe
-file=ABI_DIR\BUILD_DIR\t_logfilter.exe          test\t_logfilter.exe
-file=ABI_DIR\BUILD_DIR\t_lognotify.exe          test\t_lognotify.exe
-file=ABI_DIR\BUILD_DIR\t_logview2.exe           test\t_logview2.exe
-file=ABI_DIR\BUILD_DIR\t_logviewfail.exe        test\t_logviewfail.exe
-file=ABI_DIR\BUILD_DIR\t_logviewfail2.exe       test\t_logviewfail2.exe
-file=ABI_DIR\BUILD_DIR\t_logviewfail3.exe       test\t_logviewfail3.exe
-file=ABI_DIR\BUILD_DIR\t_logbench.exe           test\t_logbench.exe
-file=ABI_DIR\BUILD_DIR\t_logbackup.exe          test\t_logbackup.exe
-file=ABI_DIR\BUILD_DIR\t_logevent.exe           test\t_logevent.exe
-file=ABI_DIR\BUILD_DIR\t_logwrap.exe            test\t_logwrap.exe
-file=ABI_DIR\BUILD_DIR\t_logcontact.exe         test\t_logcontact.exe
-file=ABI_DIR\BUILD_DIR\t_logcntmatch.exe        test\t_logcntmatch.exe
-file=ABI_DIR\BUILD_DIR\t_logmaxnumlen.exe       test\t_logmaxnumlen.exe
-file=ABI_DIR\BUILD_DIR\t_logorderbyid.exe       test\t_logorderbyid.exe
-file=ABI_DIR\BUILD_DIR\t_logservercrash.exe     test\t_logservercrash.exe
-file=ABI_DIR\BUILD_DIR\t_loghicaphelper.exe     test\t_loghicaphelper.exe
-file=ABI_DIR\BUILD_DIR\t_loghicapability.exe    test\t_loghicapability.exe
-file=ABI_DIR\BUILD_DIR\t_loglowcapability.exe   test\t_loglowcapability.exe
-file=ABI_DIR\BUILD_DIR\t_logsecureview_hicap.exe    test\t_logsecureview_hicap.exe
-file=ABI_DIR\BUILD_DIR\t_logsecureview_lowcap.exe   test\t_logsecureview_lowcap.exe
-file=ABI_DIR\BUILD_DIR\t_logsecurity.exe        test\t_logsecurity.exe
-file=ABI_DIR\BUILD_DIR\t_logservipc.exe         test\t_logservipc.exe
-file=ABI_DIR\BUILD_DIR\t_logapi_helper.exe      test\t_logapi_helper.exe
-file=ABI_DIR\BUILD_DIR\t_logcompat.exe          test\t_logcompat.exe
-file=ABI_DIR\BUILD_DIR\t_logsimid.exe           test\t_logsimid.exe
+file=ABI_DIR\BUILD_DIR\t_logtype.exe          	Test\t_logtype.exe
+file=ABI_DIR\BUILD_DIR\t_logapi.exe          	Test\t_logapi.exe
+file=ABI_DIR\BUILD_DIR\t_logapi2.exe          	Test\t_logapi2.exe
+file=ABI_DIR\BUILD_DIR\t_logbadclient.exe          	Test\t_logbadclient.exe
+file=ABI_DIR\BUILD_DIR\t_logview1.exe        	Test\t_logview1.exe
+file=ABI_DIR\BUILD_DIR\t_logpurge.exe      	Test\t_logpurge.exe
+file=ABI_DIR\BUILD_DIR\t_logheap.exe      	Test\t_logheap.exe
+file=ABI_DIR\BUILD_DIR\t_logfile.exe      	Test\t_logfile.exe
+file=ABI_DIR\BUILD_DIR\t_logfilter.exe      	Test\t_logfilter.exe
+file=ABI_DIR\BUILD_DIR\t_lognotify.exe      	Test\t_lognotify.exe
+file=ABI_DIR\BUILD_DIR\t_logview2.exe      	Test\t_logview2.exe
+file=ABI_DIR\BUILD_DIR\t_logviewfail.exe      	Test\t_logviewfail.exe
+file=ABI_DIR\BUILD_DIR\t_logviewfail2.exe     Test\t_logviewfail2.exe
+file=ABI_DIR\BUILD_DIR\t_logviewfail3.exe      	Test\t_logviewfail3.exe
+file=ABI_DIR\BUILD_DIR\t_logbench.exe      	Test\t_logbench.exe
+file=ABI_DIR\BUILD_DIR\t_logbackup.exe      	Test\t_logbackup.exe
+file=ABI_DIR\BUILD_DIR\t_logevent.exe      	Test\t_logevent.exe
+file=ABI_DIR\BUILD_DIR\t_logwrap.exe      	Test\t_logwrap.exe
+file=ABI_DIR\BUILD_DIR\t_logcontact.exe      	Test\t_logcontact.exe
+file=ABI_DIR\BUILD_DIR\t_logcntmatch.exe      	Test\t_logcntmatch.exe
+file=ABI_DIR\BUILD_DIR\t_logmaxnumlen.exe    Test\t_logmaxnumlen.exe
+file=ABI_DIR\BUILD_DIR\t_logorderbyid.exe		Test\t_logorderbyid.exe
+file=ABI_DIR\BUILD_DIR\t_logservercrash.exe     Test\t_logservercrash.exe
+file=ABI_DIR\BUILD_DIR\t_loghicaphelper.exe	Test\t_loghicaphelper.exe
+file=ABI_DIR\BUILD_DIR\t_loghicapability.exe	Test\t_loghicapability.exe
+file=ABI_DIR\BUILD_DIR\t_loglowcapability.exe	Test\t_loglowcapability.exe
+file=ABI_DIR\BUILD_DIR\t_logsecureview_hicap.exe	Test\t_logsecureview_hicap.exe
+file=ABI_DIR\BUILD_DIR\t_logsecureview_lowcap.exe	Test\t_logsecureview_lowcap.exe
+file=ABI_DIR\BUILD_DIR\t_logsecurity.exe	Test\t_logsecurity.exe
+file=ABI_DIR\BUILD_DIR\t_logservipc.exe		Test\t_logservipc.exe
+file=ABI_DIR\BUILD_DIR\t_logapi_helper.exe		Test\t_logapi_helper.exe
+file=ABI_DIR\BUILD_DIR\t_logcompat.exe	Test\t_logcompat.exe
+file=ABI_DIR\BUILD_DIR\t_logsimid.exe	Test\t_logsimid.exe
 
-data=DATAZ_\test\logengtests.bat                test\logengtests.bat
-data=DATAZ_\test\oldlogdbu.dat                  test\oldlogdbu.dat
-data=DATAZ_\test\corruptlogdbu.dat              test\corruptlogdbu.dat
-data=DATAZ_\test\corruptdamagedlogdbu.dat       test\corruptdamagedlogdbu.dat
-data=DATAZ_\test\101f401d_test.txt              test\101f401d_test.txt
+data=DATAZ_\test\logengtests.bat          Test\logengtests.bat
+
+data=DATAZ_\test\oldLogdbu.dat            Test\oldLogdbu.dat
+data=DATAZ_\test\corruptLogdbu.dat        Test\corruptLogdbu.dat
+data=DATAZ_\test\corruptDamagedLogdbu.dat Test\corruptDamagedLogdbu.dat
+data=DATAZ_\test\101f401d_test.txt        Test\101f401d_test.txt
 
 //The next line to be uncommented if the testing is performed locally. Otherwise t_logview2 fails - 
 //the following file is missing and needed by the time zone server.
-//data=ZPRIVATE\10202BE9\1020383e.txt           private\10202be9\1020383e.txt
+//data=ZPRIVATE\10202BE9\1020383e.txt     private\10202be9\1020383e.txt
 
 #endif
Binary file loggingservices/eventlogger/conf/eventlogger.confml has changed
--- a/loggingservices/eventlogger/group/BLD.INF	Wed Sep 15 14:05:58 2010 +0300
+++ b/loggingservices/eventlogger/group/BLD.INF	Wed Oct 13 16:30:44 2010 +0300
@@ -23,7 +23,7 @@
 
 ../LogWrap/inc/LOGWRAP.H SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(logwrap.h)
 ../LogWrap/inc/LOGWRAPCONST.H SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(logwrapconst.h)
-../LogWrap/inc/LOGWRAPLIMITS.H SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(logwraplimits.h)
+../LogWrap/inc/LOGWRAPLIMITS.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(logwraplimits.h)
 ../LogWrap/inc/LOGWRAP.INL SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(logwrap.inl)
 ../LogWrap/inc/LOGWRAP.HRH /epoc32/include/logwrap.hrh
 ../LogWrap/inc/LOGFILTERANDEVENTCONSTANTS.HRH /epoc32/include/logfilterandeventconstants.hrh
@@ -64,9 +64,9 @@
 ../Rom/logengtest.iby                   /epoc32/rom/include/logengtest.iby
 ../group/logengtests.bat                z:/test/logengtests.bat
 
-../test/src/oldLogdbu.dat               z:/test/oldlogdbu.dat
-../test/src/corruptLogdbu.dat           z:/test/corruptlogdbu.dat
-../test/src/corruptDamagedLogdbu.dat    z:/test/corruptdamagedlogdbu.dat
+../test/src/oldLogdbu.dat               z:/test/oldLogdbu.dat
+../test/src/corruptLogdbu.dat           z:/test/corruptLogdbu.dat
+../test/src/corruptDamagedLogdbu.dat    z:/test/corruptDamagedLogdbu.dat
 ../test/101f401d.txt                    z:/test/101f401d_test.txt
 
 PRJ_TESTMMPFILES
--- a/loggingservices/eventlogger/group/logserv.mmp	Wed Sep 15 14:05:58 2010 +0300
+++ b/loggingservices/eventlogger/group/logserv.mmp	Wed Oct 13 16:30:44 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -101,6 +101,7 @@
 HEADER
 END
 
+
 LIBRARY				euser.lib
 LIBRARY				efsrv.lib
 LIBRARY				bafl.lib
--- a/loggingservices/eventlogger/test/src/t_logapi.cpp	Wed Sep 15 14:05:58 2010 +0300
+++ b/loggingservices/eventlogger/test/src/t_logapi.cpp	Wed Oct 13 16:30:44 2010 +0300
@@ -769,7 +769,7 @@
 	User::After(1000);
 	
 	 //copy the repository file to the folder 10202be9
-	_LIT(KCommandParameters1,		"z:\\test\\101f401d_TEST.txt;c:\\private\\10202be9\\101f401d.txt;0");
+	_LIT(KCommandParameters1,		"z:\\test\\101f401d_test.txt;c:\\private\\10202be9\\101f401d.txt;0");
 	r = process.Create(KExecutableFileName, KCommandParameters1); 
 	process.Resume();
 	process.Close();	 
--- a/loggingservices/eventlogger/test/src/t_logcntmatch.cpp	Wed Sep 15 14:05:58 2010 +0300
+++ b/loggingservices/eventlogger/test/src/t_logcntmatch.cpp	Wed Oct 13 16:30:44 2010 +0300
@@ -18,6 +18,8 @@
 
 RTest TheTest(_L("t_logcntmatch"));
 
+#ifdef SYSLIBS_TEST
+
 TBool TheMatchingIsEnabled = EFalse;
 //TheContactNameFmt variable must be initialized before tests. 
 //It gives an information what is the contact name format in the logs.
@@ -318,3 +320,12 @@
 
 	CleanupStack::PopAndDestroy(client);
 	}
+
+#else //SYSLIBS_TEST
+
+void doTestsL()
+	{
+	TheTest.Start(_L("This test can be run only when built with SYSLIBS_TEST macro defined!"));
+	}
+
+#endif //SYSLIBS_TEST
--- a/loggingservices/eventlogger/test/src/t_logservercrash.cpp	Wed Sep 15 14:05:58 2010 +0300
+++ b/loggingservices/eventlogger/test/src/t_logservercrash.cpp	Wed Oct 13 16:30:44 2010 +0300
@@ -14,6 +14,12 @@
 // T_LOGSERVCRASH.CPP
 // This tests the fix implemented for DEF047320
 // 
+// If this test starts failing, then go and check the CentralRepository private data cage 
+// (c:\\private\\10202be9 or z:\\private\\10202be9) if 101f401d.txt file is there.
+// If it is then delete it and try the test again.
+// (The problem is that if there is an existing 101f401d.txt file, then the contact match count value
+// will be loaded from that file, not from the LogEng resource file)
+//
 
 #include <s32file.h>
 #include <e32math.h>
--- a/loggingservices/eventlogger/test/src/t_logview1.cpp	Wed Sep 15 14:05:58 2010 +0300
+++ b/loggingservices/eventlogger/test/src/t_logview1.cpp	Wed Oct 13 16:30:44 2010 +0300
@@ -12,6 +12,12 @@
 //
 // Description:
 //
+// If this test starts failing, then go and check the CentralRepository private data cage 
+// (c:\\private\\10202be9 or z:\\private\\10202be9) if 101f401d.txt file is there.
+// If it is then delete it and try the test again.
+// (The problem is that if there is an existing 101f401d.txt file, then the contact match count value
+// will be loaded from that file, not from the LogEng resource file)
+//
 
 #include <s32file.h>
 #include <s32mem.h>
--- a/loggingservices/eventlogger/test/t_logapi.mmp	Wed Sep 15 14:05:58 2010 +0300
+++ b/loggingservices/eventlogger/test/t_logapi.mmp	Wed Oct 13 16:30:44 2010 +0300
@@ -18,11 +18,11 @@
 TARGET        	t_logapi.exe
 TARGETTYPE    	exe
 
-CAPABILITY	  	WriteDeviceData ReadDeviceData WriteUserData ReadUserData AllFiles 
+CAPABILITY	  	WriteDeviceData ReadDeviceData WriteUserData ReadUserData AllFiles
 
 USERINCLUDE   	../test/inc
 USERINCLUDE   	../Shared
-USERINCLUDE		../LogServ/inc
+USERINCLUDE     ../LogServ/inc
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 SOURCEPATH		../test/src
--- a/loggingservices/eventlogger/test/t_logcntmatch.mmp	Wed Sep 15 14:05:58 2010 +0300
+++ b/loggingservices/eventlogger/test/t_logcntmatch.mmp	Wed Oct 13 16:30:44 2010 +0300
@@ -20,7 +20,7 @@
 
 USERINCLUDE		../test/inc
 USERINCLUDE		../Shared
-USERINCLUDE		../LogServ/inc
+USERINCLUDE     ../LogServ/inc
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 SOURCEPATH		../test/src
--- a/loggingservices/eventlogger/test/t_loghicaphelper.mmp	Wed Sep 15 14:05:58 2010 +0300
+++ b/loggingservices/eventlogger/test/t_loghicaphelper.mmp	Wed Oct 13 16:30:44 2010 +0300
@@ -20,7 +20,7 @@
 
 USERINCLUDE		../test/inc
 USERINCLUDE		../Shared
-USERINCLUDE		../LogServ/inc
+USERINCLUDE     ../LogServ/inc
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 SOURCEPATH	  	../test/src
--- a/persistentstorage/dbms/group/BLD.INF	Wed Sep 15 14:05:58 2010 +0300
+++ b/persistentstorage/dbms/group/BLD.INF	Wed Oct 13 16:30:44 2010 +0300
@@ -83,23 +83,23 @@
 DBMSTests.iby                   /epoc32/rom/include/dbmstests.iby
 DbmsTests.bat                   z:/test/dbmstests.bat
 
-../tdbms/11335577.SPD           z:/private/100012a5/policy/11335577.spd
-../tdbms/11335578.SPD           z:/private/100012a5/policy/11335578.spd
-../tdbms/11335579.SPD           z:/private/100012a5/policy/11335579.spd
+../tdbms/11335577.spd           z:/private/100012a5/policy/11335577.spd
+../tdbms/11335578.spd           z:/private/100012a5/policy/11335578.spd
+../tdbms/11335579.spd           z:/private/100012a5/policy/11335579.spd
 ../tdbms/1133557A.spd           z:/private/100012a5/policy/1133557a.spd
-../tdbms/12344321.SPD           z:/private/100012a5/policy/12344321.spd
-../tdbms/DBS_11335578_A.DB      z:/private/100012a5/dbs_11335578_a.db
-../tdbms/DBS_11335578_B.DB      z:/private/100012a5/dbs_11335578_b.db
-../tdbms/DBS_11335578_Z.DB      z:/private/100012a5/dbs_11335578_z.db
-../tdbms/DBS_11335579_TESTDB.DB z:/private/100012a5/dbs_11335579_testdb.db
-../tdbms/DBS_1133557A_ZZZ.DB    z:/private/100012a5/dbs_1133557a_zzz.db
-../tdbms/DBS_12344321_1234567890123456789012345678901234567890123456789012345678901234567890.DB	z:/private/100012a5/dbs_12344321_1234567890123456789012345678901234567890123456789012345678901234567890.db
+../tdbms/12344321.spd           z:/private/100012a5/policy/12344321.spd
+../tdbms/dbs_11335578_A.DB      z:/private/100012a5/dbs_11335578_a.db
+../tdbms/dbs_11335578_B.DB      z:/private/100012a5/dbs_11335578_b.db
+../tdbms/dbs_11335578_Z.DB      z:/private/100012a5/dbs_11335578_z.db
+../tdbms/dbs_11335579_TESTDB.DB z:/private/100012a5/dbs_11335579_testdb.db
+../tdbms/dbs_1133557A_ZZZ.DB    z:/private/100012a5/dbs_1133557a_zzz.db
+../tdbms/dbs_12344321_1234567890123456789012345678901234567890123456789012345678901234567890.DB	z:/private/100012a5/dbs_12344321_1234567890123456789012345678901234567890123456789012345678901234567890.db
 ../tdbms/11335577.txt           z:/test/11335577.txt
 ../tdbms/11335578.txt           z:/test/11335578.txt
 ../tdbms/11335579.txt           z:/test/11335579.txt
-../tdbms/1133557A.txt           z:/test/1133557a.txt
+../tdbms/1133557A.txt           z:/test/1133557A.txt
 ../tdbms/t_dbperf1.sql          z:/test/t_dbperf1.sql
-../tdbms/T_SCRIPT.TXT           z:/test/t_script.txt
-../tdbms/TypeTextKTests44.dat   z:/test/typetextktests44.dat
-../tdbms/TypeTextKTests46.dat   z:/test/typetextktests46.dat
-../tdbms/TypeTextKTests47.dat   z:/test/typetextktests47.dat
+../tdbms/t_script.txt           z:/test/t_script.txt
+../tdbms/typetextktests44.dat   z:/test/typetextktests44.dat
+../tdbms/typetextktests46.dat   z:/test/typetextktests46.dat
+../tdbms/typetextktests47.dat   z:/test/typetextktests47.dat
--- a/persistentstorage/dbms/group/DBMSTests.iby	Wed Sep 15 14:05:58 2010 +0300
+++ b/persistentstorage/dbms/group/DBMSTests.iby	Wed Oct 13 16:30:44 2010 +0300
@@ -20,66 +20,68 @@
 REM DBMS Tests
 #include <dbms.iby>
 
-data=DATAZ_\test\dbmstests.bat               \test\dbmstests.bat
-data=DATAZ_\test\t_script.txt                \test\t_script.txt
-data=DATAZ_\test\11335577.txt                \test\11335577.txt	
-data=DATAZ_\test\11335578.txt                \test\11335578.txt		
-data=DATAZ_\test\11335579.txt                \test\11335579.txt		
-data=DATAZ_\test\1133557a.txt                \test\1133557a.txt		
-data=DATAZ_\test\t_dbperf1.sql               \test\t_dbperf1.sql	
+data=DATAZ_\test\DBMStests.bat               \TEST\DBMStests.bat
+
+data=DATAZ_\TEST\T_SCRIPT.TXT                \TEST\T_SCRIPT.TXT
+data=DATAZ_\TEST\11335577.TXT                \TEST\11335577.TXT	
+data=DATAZ_\TEST\11335578.TXT                \TEST\11335578.TXT	
+data=DATAZ_\TEST\11335579.TXT                \TEST\11335579.TXT	
+data=DATAZ_\TEST\1133557A.TXT                \TEST\1133557A.TXT	
+data=DATAZ_\TEST\t_dbperf1.sql               \TEST\t_dbperf1.sql	
 
 // Work around for DEF063276
-data=DATAZ_\test\typetextktests44.dat        \test\typetextktests44.dat
-data=DATAZ_\test\typetextktests46.dat        \test\typetextktests46.dat
-data=DATAZ_\test\typetextktests47.dat        \test\typetextktests47.dat
+data=DATAZ_\test\TypeTextKTests44.dat        \TEST\TypeTextKTests44.dat
+data=DATAZ_\test\TypeTextKTests46.dat        \TEST\TypeTextKTests46.dat
+data=DATAZ_\test\TypeTextKTests47.dat        \TEST\TypeTextKTests47.dat
 
-data=ZPRIVATE\100012a5\policy\11335577.spd      \private\100012a5\pOLICY\11335577.spd
-data=ZPRIVATE\100012a5\policy\11335578.spd      \private\100012a5\pOLICY\11335578.spd
-data=ZPRIVATE\100012a5\policy\11335579.spd      \private\100012a5\pOLICY\11335579.spd
-data=ZPRIVATE\100012a5\policy\1133557a.spd      \private\100012a5\pOLICY\1133557a.spd
-data=ZPRIVATE\100012a5\policy\12344321.spd      \private\100012a5\pOLICY\12344321.spd
-data=ZPRIVATE\100012a5\dbs_11335578_a.db        \private\100012a5\dbs_11335578_a.dB
-data=ZPRIVATE\100012a5\dbs_11335578_b.db        \private\100012a5\dbs_11335578_b.dB
-data=ZPRIVATE\100012a5\dbs_11335578_z.db        \private\100012a5\dbs_11335578_z.db
-data=ZPRIVATE\100012a5\dbs_11335579_testdb.db   \private\100012a5\dbs_11335579_testdb.db
-data=ZPRIVATE\100012a5\dbs_12344321_1234567890123456789012345678901234567890123456789012345678901234567890.DB \PRIVATE\100012A5\dbs_12344321_1234567890123456789012345678901234567890123456789012345678901234567890.db
-data=ZPRIVATE\100012a5\dbs_1133557a_zzz.db      \private\100012a5\dbs_1133557a_zzz.db
+data=ZPRIVATE\100012A5\POLICY\11335577.SPD   \PRIVATE\100012A5\POLICY\11335577.SPD
+data=ZPRIVATE\100012A5\POLICY\11335578.SPD   \PRIVATE\100012A5\POLICY\11335578.SPD
+data=ZPRIVATE\100012A5\POLICY\11335579.SPD   \PRIVATE\100012A5\POLICY\11335579.SPD
+data=ZPRIVATE\100012A5\POLICY\1133557A.SPD   \PRIVATE\100012A5\POLICY\1133557A.SPD
+data=ZPRIVATE\100012A5\POLICY\12344321.SPD   \PRIVATE\100012A5\POLICY\12344321.SPD
+data=ZPRIVATE\100012A5\DBS_11335578_A.DB     \PRIVATE\100012A5\Dbs_11335578_a.dB
+data=ZPRIVATE\100012A5\DBS_11335578_B.DB     \PRIVATE\100012A5\dbs_11335578_b.DB
+data=ZPRIVATE\100012A5\DBS_11335578_Z.DB     \PRIVATE\100012A5\dBS_11335578_z.db
+data=ZPRIVATE\100012A5\DBS_11335579_TESTDB.DB \PRIVATE\100012A5\DbS_11335579_TEStdB.DB
+data=ZPRIVATE\100012A5\DBS_12344321_1234567890123456789012345678901234567890123456789012345678901234567890.DB \PRIVATE\100012A5\DBS_12344321_1234567890123456789012345678901234567890123456789012345678901234567890.DB
+data=ZPRIVATE\100012A5\DBS_1133557A_ZZZ.DB   \PRIVATE\100012A5\DBS_1133557A_ZZZ.db
 
-file=ABI_DIR\BUILD_DIR\T_DBENVCREATE.EXE	\test\t_dbenvcreate.exe
-file=ABI_DIR\BUILD_DIR\T_DBALTER.EXE		\test\t_dbalter.exe
-file=ABI_DIR\BUILD_DIR\T_DBBENCH.EXE		\test\t_dbbench.exe
-file=ABI_DIR\BUILD_DIR\T_DBBIG.EXE			\test\t_dbbig.exe
-file=ABI_DIR\BUILD_DIR\T_DBBUG.EXE			\test\t_dbbug.exe
-file=ABI_DIR\BUILD_DIR\T_DBCLIENT.EXE		\test\t_dbclient.exe
-file=ABI_DIR\BUILD_DIR\T_DBCOMP.EXE			\test\t_dbcomp.exe
-file=ABI_DIR\BUILD_DIR\T_DBAPI.EXE			\test\t_dbapi.exe
-file=ABI_DIR\BUILD_DIR\T_DBSRV.EXE			\test\t_dbsrv.exe
-file=ABI_DIR\BUILD_DIR\T_DBFAIL.EXE			\test\t_dbfail.exe
-file=ABI_DIR\BUILD_DIR\T_DBINDEX.EXE		\test\t_dbindex.exe
-file=ABI_DIR\BUILD_DIR\T_DBLIMIT.EXE		\test\t_dblimit.exe
-file=ABI_DIR\BUILD_DIR\T_DBSCRIPT.EXE		\test\t_dbscript.exe
-file=ABI_DIR\BUILD_DIR\T_DBSQL.EXE			\test\t_dbsql.exe
-file=ABI_DIR\BUILD_DIR\T_DBSTRESS.EXE		\test\t_dbstress.exe
-file=ABI_DIR\BUILD_DIR\T_DBTRANS.EXE		\test\t_dbtrans.exe
-file=ABI_DIR\BUILD_DIR\T_DBWINDOW.EXE		\test\t_dbwindow.exe
-file=ABI_DIR\BUILD_DIR\T_DBPANIC.EXE		\test\t_dbpanic.exe
-file=ABI_DIR\BUILD_DIR\T_DBDEFECT.EXE		\test\t_dbdefect.exe
-file=ABI_DIR\BUILD_DIR\T_DBLONGCOL.EXE		\test\t_dblongcol.exe
-file=ABI_DIR\BUILD_DIR\T_DBPLATSEC.EXE		\test\t_dbplatsec.exe
-file=ABI_DIR\BUILD_DIR\T_DBPLATSEC1.EXE		\test\t_dbplatsec1.exe
-file=ABI_DIR\BUILD_DIR\T_DBPLATSEC2.EXE		\test\t_dbplatsec2.exe
-file=ABI_DIR\BUILD_DIR\T_DBPLATSEC3.EXE		\test\t_dbplatsec3.exe
-file=ABI_DIR\BUILD_DIR\T_DBPLATSEC4.EXE		\test\t_dbplatsec4.exe
-file=ABI_DIR\BUILD_DIR\T_DBPLATSEC5.EXE		\test\t_dbplatsec5.exe
-file=ABI_DIR\BUILD_DIR\T_DBNEWCAP1.EXE		\test\t_dbnewcap1.exe
-file=ABI_DIR\BUILD_DIR\T_DBPLATSECPERF.EXE	\test\t_dbplatsecperf.eXE
-file=ABI_DIR\BUILD_DIR\T_DBBACKUPSID.EXE	\test\t_dbbackupsid.exe
-file=ABI_DIR\BUILD_DIR\T_DBOOD.EXE			\test\t_dbood.exe
-file=ABI_DIR\BUILD_DIR\T_DBSTRCMP.EXE		\test\t_dbstrcmp.exe
-file=ABI_DIR\BUILD_DIR\T_DBPERF1.EXE		\test\t_dbperf1.exe
-file=ABI_DIR\BUILD_DIR\T_DBPERF2.EXE		\test\t_dbperf2.exe
-file=ABI_DIR\BUILD_DIR\T_DBPERF3.EXE		\test\t_dbperf3.exe
-file=ABI_DIR\BUILD_DIR\T_DBENVDESTROY.EXE	\test\t_dbenvdestroy.exE
+file=ABI_DIR\BUILD_DIR\TEST.DBX				\SYSTEM\LIBS\TEST.DBX
+file=ABI_DIR\BUILD_DIR\T_DBENVCREATE.EXE	\TEST\T_DBENVCREATE.EXE
+file=ABI_DIR\BUILD_DIR\T_DBALTER.EXE		\TEST\T_DBALTER.EXE
+file=ABI_DIR\BUILD_DIR\T_DBBENCH.EXE		\TEST\T_DBBENCH.EXE
+file=ABI_DIR\BUILD_DIR\T_DBBIG.EXE			\TEST\T_DBBIG.EXE
+file=ABI_DIR\BUILD_DIR\T_DBBUG.EXE			\TEST\T_DBBUG.EXE
+file=ABI_DIR\BUILD_DIR\T_DBCLIENT.EXE		\TEST\T_DBCLIENT.EXE
+file=ABI_DIR\BUILD_DIR\T_DBCOMP.EXE			\TEST\T_DBCOMP.EXE
+file=ABI_DIR\BUILD_DIR\T_DBAPI.EXE			\TEST\T_DBAPI.EXE
+file=ABI_DIR\BUILD_DIR\T_DBSRV.EXE			\TEST\T_DBSRV.EXE
+file=ABI_DIR\BUILD_DIR\T_DBFAIL.EXE			\TEST\T_DBFAIL.EXE
+file=ABI_DIR\BUILD_DIR\T_DBINDEX.EXE		\TEST\T_DBINDEX.EXE
+file=ABI_DIR\BUILD_DIR\T_DBLIMIT.EXE		\TEST\T_DBLIMIT.EXE
+file=ABI_DIR\BUILD_DIR\T_DBSCRIPT.EXE		\TEST\T_DBSCRIPT.EXE
+file=ABI_DIR\BUILD_DIR\T_DBSQL.EXE			\TEST\T_DBSQL.EXE
+file=ABI_DIR\BUILD_DIR\T_DBSTRESS.EXE		\TEST\T_DBSTRESS.EXE
+file=ABI_DIR\BUILD_DIR\T_DBTRANS.EXE		\TEST\T_DBTRANS.EXE
+file=ABI_DIR\BUILD_DIR\T_DBWINDOW.EXE		\TEST\T_DBWINDOW.EXE
+file=ABI_DIR\BUILD_DIR\T_DBPANIC.EXE		\TEST\T_DBPANIC.EXE
+file=ABI_DIR\BUILD_DIR\T_DBDEFECT.EXE		\TEST\T_DBDEFECT.EXE
+file=ABI_DIR\BUILD_DIR\T_DBLONGCOL.EXE		\TEST\T_DBLONGCOL.EXE
+file=ABI_DIR\BUILD_DIR\T_DBPLATSEC.EXE		\TEST\T_DBPLATSEC.EXE
+file=ABI_DIR\BUILD_DIR\T_DBPLATSEC1.EXE		\TEST\T_DBPLATSEC1.EXE
+file=ABI_DIR\BUILD_DIR\T_DBPLATSEC2.EXE		\TEST\T_DBPLATSEC2.EXE
+file=ABI_DIR\BUILD_DIR\T_DBPLATSEC3.EXE		\TEST\T_DBPLATSEC3.EXE
+file=ABI_DIR\BUILD_DIR\T_DBPLATSEC4.EXE		\TEST\T_DBPLATSEC4.EXE
+file=ABI_DIR\BUILD_DIR\T_DBPLATSEC5.EXE		\TEST\T_DBPLATSEC5.EXE
+file=ABI_DIR\BUILD_DIR\T_DBNEWCAP1.EXE		\TEST\T_DBNEWCAP1.EXE
+file=ABI_DIR\BUILD_DIR\T_DBPLATSECPERF.EXE	\TEST\T_DBPLATSECPERF.EXE
+file=ABI_DIR\BUILD_DIR\T_DBBACKUPSID.EXE	\TEST\T_DBBACKUPSID.EXE
+file=ABI_DIR\BUILD_DIR\T_DBOOD.EXE			\TEST\T_DBOOD.EXE
+file=ABI_DIR\BUILD_DIR\T_DBSTRCMP.EXE		\TEST\T_DBSTRCMP.EXE
+file=ABI_DIR\BUILD_DIR\T_DBPERF1.EXE		\TEST\T_DBPERF1.EXE
+file=ABI_DIR\BUILD_DIR\T_DBPERF2.EXE		\TEST\T_DBPERF2.EXE
+file=ABI_DIR\BUILD_DIR\T_DBPERF3.EXE		\TEST\T_DBPERF3.EXE
+file=ABI_DIR\BUILD_DIR\T_DBENVDESTROY.EXE	\TEST\T_DBENVDESTROY.EXE
 
 
 #endif
Binary file persistentstorage/dbms/tdbms/U_SCRIPT.TXT has changed
--- a/persistentstorage/sql/GROUP/BLD.INF	Wed Sep 15 14:05:58 2010 +0300
+++ b/persistentstorage/sql/GROUP/BLD.INF	Wed Oct 13 16:30:44 2010 +0300
@@ -53,13 +53,13 @@
 ../TEST/t_SqlShortNonDb.db                  z:/test/t_sqlshortnondb.db
 ../TEST/contacts_startup_time.sql           z:/test/contacts_startup_time.sql
 ../TEST/t_inc095412.db                      z:/test/t_inc095412.db
-../TEST/default_avacon.dbSQL                z:/test/default_avacon.dbsql
+../TEST/default_avacon.dbSQL                z:/test/default_avacon.dbSQL
 ../TEST/t_sqlbur_backup_ver0.bak            z:/test/t_sqlbur_backup_ver0.bak
 ../TEST/t_sqlperformance4.sql               z:/test/t_sqlperformance4.sql
 ../TEST/{21212122}AADb2.db                  z:/private/10281e17/[21212122]aadb2.db
 ../TEST/{21212122}BBDb2.db                  z:/private/10281e17/[21212122]bbdb2.db
-../TEST/{21212125}t_ab.db                   z:/private/10281e17/[21212125]t_ab.db
-../TEST/{1111CCCC}t_ab.db                   z:/private/10281e17/[1111cccc]t_ab.db
+../TEST/{21212125}T_AB.db                   z:/private/10281e17/[21212125]t_ab.db
+../TEST/{1111CCCC}T_AB.db                   z:/private/10281e17/[1111CCCC]t_ab.db
 ../TEST/{21212125}T_OneDefPolicy.db         z:/private/10281e17/[21212125]t_onedefpolicy.db
 //../TEST/SqlServer.cfg                     z:/private/10281e17/sqlserver.cfg
 ../TEST/t_sqldb1.db                         z:/private/21212124/t_sqldb1.db
--- a/persistentstorage/sql/GROUP/sqltests.bat	Wed Sep 15 14:05:58 2010 +0300
+++ b/persistentstorage/sql/GROUP/sqltests.bat	Wed Oct 13 16:30:44 2010 +0300
@@ -14,54 +14,54 @@
 @rem Description:
 @rem
 
-t_sqlenvcreate.exe
-t_sqlite.exe
-t_sqlapi.exe
-t_sqlapi2.exe
-t_sqlpanic.exe
-t_sqllang.exe
-t_sqloom1.exe
-t_sqloom2.exe
-t_sqloom3.exe
-t_sqloom4.exe
-t_sqloom5.exe
-t_sqloom6.exe
-t_sqlmulti.exe
-t_sqlcollate.exe
-t_sqltrans.exe
-t_sqlload.exe
-t_sqlgetfirststmt.exe
-t_sqlsecurity1.exe
-t_sqlsecurity2.exe
-t_sqlsecurity3.exe
-t_sqlsecurity4.exe
-t_sqlsecurity5.exe
-t_sqlsecurity6.exe
-t_sqlattach.exe
-t_sqlperformance.exe
-t_sqlperformance2.exe
-t_sqlperformance3.exe
-t_sqlperformance4.exe
-t_sqlperformance5.exe
-t_sqlood.exe
-t_sqloslayer.exe
-t_sqldefect.exe
-t_sqldefect2.exe
-t_sqlprivcage.exe
-t_sqlbadclient.exe
-t_sqlbur.exe
-t_sqlscalarfullselect.exe
-t_sqlfserr.exe
-t_sqlconfig.exe
-t_sqlconfigfile.exe
-t_sqldbconfigfile.exe
-t_sqlcompact1.exe
-t_sqlcompact2.exe
-t_sqlcompact3.exe
-t_sqlcompact4.exe
-t_sqlblob.exe
-t_sqlfilebuf64.exe
-t_sqlauthorizer.exe
-t_sqlstartup.exe
-t_sqlcorrupt.exe
-t_sqlenvdestroy.exe
+T_SQLENVCREATE.EXE
+T_SQLITE.EXE
+T_SQLAPI.EXE
+T_SQLAPI2.EXE
+T_SQLPANIC.EXE
+T_SQLLANG.EXE
+T_SQLOOM1.EXE
+T_SQLOOM2.EXE
+T_SQLOOM3.EXE
+T_SQLOOM4.EXE
+T_SQLOOM5.EXE
+T_SQLOOM6.EXE
+T_SQLMULTI.EXE
+T_SQLCOLLATE.EXE
+T_SQLTRANS.EXE
+T_SQLLOAD.EXE
+T_SQLGETFIRSTSTMT.EXE
+T_SQLSECURITY1.EXE
+T_SQLSECURITY2.EXE
+T_SQLSECURITY3.EXE
+T_SQLSECURITY4.EXE
+T_SQLSECURITY5.EXE
+T_SQLSECURITY6.EXE
+T_SQLATTACH.EXE
+T_SQLPERFORMANCE.EXE
+T_SQLPERFORMANCE2.EXE
+T_SQLPERFORMANCE3.EXE
+T_SQLPERFORMANCE4.EXE
+T_SQLPERFORMANCE5.EXE
+T_SQLOOD.EXE
+T_SQLOSLAYER.EXE
+T_SQLDEFECT.EXE
+T_SQLDEFECT2.EXE
+T_SQLPRIVCAGE.EXE
+T_SQLBADCLIENT.EXE
+T_SQLBUR.EXE
+T_SQLSCALARFULLSELECT.EXE
+T_SQLFSERR.EXE
+T_SQLCONFIG.EXE
+T_SQLCONFIGFILE.EXE
+T_SQLDBCONFIGFILE.EXE
+T_SQLCOMPACT1.EXE
+T_SQLCOMPACT2.EXE
+T_SQLCOMPACT3.EXE
+T_SQLCOMPACT4.EXE
+T_SQLBLOB.EXE
+T_SQLFILEBUF64.EXE
+T_SQLAUTHORIZER.EXE
+T_SQLSTARTUP.EXE
+T_SQLCORRUPT.EXE
+T_SQLENVDESTROY.EXE
--- a/persistentstorage/sql/GROUP/sqltests.iby	Wed Sep 15 14:05:58 2010 +0300
+++ b/persistentstorage/sql/GROUP/sqltests.iby	Wed Oct 13 16:30:44 2010 +0300
@@ -29,87 +29,87 @@
 //#include <uloggerclttool.iby>
 //#include <ulogger.iby>
 
-data=DATAZ_\test\sqlTests.bat                            \test\sqltests.bat
+data=DATAZ_\test\sqlTests.bat                            \TEST\sqlTests.bat
 
-data=DATAZ_\test\contacts_schema_to_vendors.sql          \test\contacts_schema_to_vendors.sql
-data=DATAZ_\test\add_simple_contacts.sql                 \test\add_simple_contacts.sql
-data=DATAZ_\test\contacts_startup_time.sql               \test\contacts_startup_time.sql
-data=DATAZ_\test\testdb1.db                              \test\testdb1.db
-data=DATAZ_\test\corruptdb.db                            \test\corruptdb.db
-data=DATAZ_\test\t_sqlshortnondb.db                      \test\t_sqlshortnondb.db
-data=DATAZ_\test\t_inc095412.db                          \test\t_inc095412.db
-data=DATAZ_\test\default_avacon.dbsql                    \test\default_avacon.dbsql
-data=DATAZ_\test\t_sqlbur_backup_ver0.bak                \test\t_sqlbur_backup_ver0.bak
-data=DATAZ_\test\t_sqlperformance4.sql                   \test\t_sqlperformance4.sql
-data=ZPRIVATE\10281e17\[21212122]aadb2.db                \private\10281e17\[21212122]aadb2.db
-data=ZPRIVATE\10281e17\[21212122]bbdb2.db                \private\10281e17\[21212122]bbdb2.db
-data=ZPRIVATE\10281e17\[21212125]t_ab.db                 \private\10281e17\[21212125]t_ab.db
-data=ZPRIVATE\10281e17\[1111cccc]t_ab.db                 \private\10281e17\[1111CCCC]t_ab.db
-data=ZPRIVATE\21212124\t_sqldb1.db                       \private\21212124\t_sqldb1.db
-data=ZPRIVATE\10281e17\[21212125]t_onedefpolicy.db       \private\10281e17\[21212125]t_onedefpolicy.db
-data=ZPRIVATE\10281e17\[98765432]t_2defaultpolicies.db   \private\10281e17\[98765432]t_2defaultpolicies.db
-data=ZPRIVATE\10281e17\[98765432]t_emptysettings.db      \private\10281e17\[98765432]t_emptysettings.db
-data=ZPRIVATE\10281e17\[98765432]t_invobject.db          \private\10281e17\[98765432]t_invobject.db
-data=ZPRIVATE\10281e17\[98765432]t_invversion.db         \private\10281e17\[98765432]t_invversion.db
-data=ZPRIVATE\10281e17\[98765432]t_longcollation.db      \private\10281e17\[98765432]t_longcollation.db
-data=ZPRIVATE\10281e17\[98765432]t_nocollation.db        \private\10281e17\[98765432]t_nocollation.db
-data=ZPRIVATE\10281e17\[98765432]t_nodefaultpolicy.db    \private\10281e17\[98765432]t_nodefaultpolicy.db
-data=ZPRIVATE\10281e17\[98765432]t_nosettings.db         \private\10281e17\[98765432]t_nosettings.db
+data=DATAZ_\test\contacts_schema_to_vendors.sql          \TEST\contacts_schema_to_vendors.sql
+data=DATAZ_\test\add_simple_contacts.sql                 \TEST\add_simple_contacts.sql
+data=DATAZ_\test\contacts_startup_time.sql               \TEST\contacts_startup_time.sql
+data=DATAZ_\test\TestDb1.DB                              \TEST\TestDb1.dB
+data=DATAZ_\test\CorruptDb.DB                            \TEST\CorruptDb.dB
+data=DATAZ_\test\t_SqlShortNonDb.db                      \TEST\t_SqlShortNonDb.db
+data=DATAZ_\test\t_inc095412.db                          \TEST\t_inc095412.db
+data=DATAZ_\test\default_avacon.dbSQL                    \TEST\default_avacon.dbSQL
+data=DATAZ_\test\t_sqlbur_backup_ver0.bak                \TEST\t_sqlbur_backup_ver0.bak
+data=DATAZ_\test\t_sqlperformance4.sql                   \TEST\t_sqlperformance4.sql
+data=ZPRIVATE\10281e17\[21212122]AADb2.db                \PRIVATE\10281e17\[21212122]AADb2.db
+data=ZPRIVATE\10281e17\[21212122]BBDb2.db                \PRIVATE\10281e17\[21212122]BBDb2.db
+data=ZPRIVATE\10281e17\[21212125]T_AB.db                 \PRIVATE\10281e17\[21212125]T_AB.db
+data=ZPRIVATE\10281e17\[1111CCCC]T_AB.db                 \PRIVATE\10281e17\[1111CCCC]T_AB.db
+data=ZPRIVATE\21212124\t_sqldb1.db                       \PRIVATE\21212124\t_sqldb1.db
+data=ZPRIVATE\10281e17\[21212125]T_OneDefPolicy.db       \PRIVATE\10281e17\[21212125]T_OneDefPolicy.db
+data=ZPRIVATE\10281e17\[98765432]t_2defaultpolicies.db   \PRIVATE\10281e17\[98765432]t_2defaultpolicies.db
+data=ZPRIVATE\10281e17\[98765432]t_emptysettings.db      \PRIVATE\10281e17\[98765432]t_emptysettings.db
+data=ZPRIVATE\10281e17\[98765432]t_invobject.db          \PRIVATE\10281e17\[98765432]t_invobject.db
+data=ZPRIVATE\10281e17\[98765432]t_invversion.db         \PRIVATE\10281e17\[98765432]t_invversion.db
+data=ZPRIVATE\10281e17\[98765432]t_longcollation.db      \PRIVATE\10281e17\[98765432]t_longcollation.db
+data=ZPRIVATE\10281e17\[98765432]t_nocollation.db        \PRIVATE\10281e17\[98765432]t_nocollation.db
+data=ZPRIVATE\10281e17\[98765432]t_nodefaultpolicy.db    \PRIVATE\10281e17\[98765432]t_nodefaultpolicy.db
+data=ZPRIVATE\10281e17\[98765432]t_nosettings.db         \PRIVATE\10281e17\[98765432]t_nosettings.db
 
-file=ABI_DIR\BUILD_DIR\t_sqlenvcreate.exe           \test\t_sqlenvcreate.exe
-file=ABI_DIR\BUILD_DIR\t_sqlite.exe                 \test\t_sqlite.exe
-file=ABI_DIR\BUILD_DIR\t_sqlapi.exe                 \test\t_sqlapi.exe
-file=ABI_DIR\BUILD_DIR\t_sqlapi2.exe                \test\t_sqlapi2.exe
-file=ABI_DIR\BUILD_DIR\t_sqlpanic.exe               \test\t_sqlpanic.exe
-file=ABI_DIR\BUILD_DIR\t_sqllang.exe                \test\t_sqllang.exe
-file=ABI_DIR\BUILD_DIR\t_sqloom1.exe                \test\t_sqloom1.exe
-file=ABI_DIR\BUILD_DIR\t_sqloom2.exe                \test\t_sqloom2.exe
-file=ABI_DIR\BUILD_DIR\t_sqloom3.exe                \test\t_sqloom3.exe
-file=ABI_DIR\BUILD_DIR\t_sqloom4.exe                \test\t_sqloom4.exe
-file=ABI_DIR\BUILD_DIR\t_sqloom5.exe                \test\t_sqloom5.exe
-file=ABI_DIR\BUILD_DIR\t_sqloom6.exe                \test\t_sqloom6.exe
-file=ABI_DIR\BUILD_DIR\t_sqlmulti.exe               \test\t_sqlmulti.exe
-file=ABI_DIR\BUILD_DIR\t_sqlcollate.exe             \test\t_sqlcollate.exe
-file=ABI_DIR\BUILD_DIR\t_sqltrans.exe               \test\t_sqltrans.exe
-file=ABI_DIR\BUILD_DIR\t_sqlload.exe                \test\t_sqlload.exe
-file=ABI_DIR\BUILD_DIR\t_sqlgetfirststmt.exe        \test\t_sqlgetfirststmt.exe
-file=ABI_DIR\BUILD_DIR\t_sqlsecurity1.exe           \test\t_sqlsecurity1.exe
-file=ABI_DIR\BUILD_DIR\t_sqlsecurity2.exe           \test\t_sqlsecurity2.exe
-file=ABI_DIR\BUILD_DIR\t_sqlsecurity3.exe           \test\t_sqlsecurity3.exe
-file=ABI_DIR\BUILD_DIR\t_sqlsecurity4.exe           \test\t_sqlsecurity4.exe
-file=ABI_DIR\BUILD_DIR\t_sqlsecurity5.exe           \test\t_sqlsecurity5.exe
-file=ABI_DIR\BUILD_DIR\t_sqlsecurity6.exe           \test\t_sqlsecurity6.exe
-file=ABI_DIR\BUILD_DIR\t_sqlattach.exe              \test\t_sqlattach.exe
-file=ABI_DIR\BUILD_DIR\t_sqlattach2.exe             \test\t_sqlattach2.exe
-file=ABI_DIR\BUILD_DIR\t_sqlperformance.exe         \test\t_sqlperformance.exe
-file=ABI_DIR\BUILD_DIR\t_sqlperformance2.exe        \test\t_sqlperformance2.exe
-file=ABI_DIR\BUILD_DIR\t_sqlperformance3.exe        \test\t_sqlperformance3.exe
-file=ABI_DIR\BUILD_DIR\t_sqlperformance4.exe        \test\t_sqlperformance4.exe
-file=ABI_DIR\BUILD_DIR\t_sqlperformance5.exe        \test\t_sqlperformance5.exe
-file=ABI_DIR\BUILD_DIR\t_sqlood.exe                 \test\t_sqlood.exe
-file=ABI_DIR\BUILD_DIR\t_sqloslayer.exe             \test\t_sqloslayer.exe
-file=ABI_DIR\BUILD_DIR\t_sqldefect.exe              \test\t_sqldefect.exe
-file=ABI_DIR\BUILD_DIR\t_sqldefect2.exe             \test\t_sqldefect2.exe
-file=ABI_DIR\BUILD_DIR\t_sqlprivcage.exe            \test\t_sqlprivcage.exe
-file=ABI_DIR\BUILD_DIR\t_sqlbadclient.exe           \test\t_sqlbadclient.exe
-file=ABI_DIR\BUILD_DIR\t_sqlbur.exe                 \test\t_sqlbur.exe
-file=ABI_DIR\BUILD_DIR\t_sqlscalarfullselect.exe    \test\t_sqlscalarfullselect.exe
-file=ABI_DIR\BUILD_DIR\t_sqlfserr.exe               \test\t_sqlfserr.exe
-file=ABI_DIR\BUILD_DIR\t_sqlconfig.exe              \test\t_sqlconfig.exe
-file=ABI_DIR\BUILD_DIR\t_sqlconfigfile.exe          \test\t_sqlconfigfile.exE
-file=ABI_DIR\BUILD_DIR\t_sqldbconfigfile.exe        \test\t_sqldbconfigfile.exe
-file=ABI_DIR\BUILD_DIR\t_sqlcompact1.exe            \test\t_sqlcompact1.exe
-file=ABI_DIR\BUILD_DIR\t_sqlcompact2.exe            \test\t_sqlcompact2.exe
-file=ABI_DIR\BUILD_DIR\t_sqlcompact3.exe            \test\t_sqlcompact3.exe
-file=ABI_DIR\BUILD_DIR\t_sqlcompact4.exe            \test\t_sqlcompact4.exe
-file=ABI_DIR\BUILD_DIR\t_sqlblob.exe                \test\t_sqlblob.exe
-file=ABI_DIR\BUILD_DIR\t_sqlauthorizer.exe          \test\t_sqlauthorizer.exe
-file=ABI_DIR\BUILD_DIR\t_sqlfilebuf64.exe           \test\t_sqlfilebuf64.exe
-file=ABI_DIR\BUILD_DIR\t_sqlstartup.exe             \test\t_sqlstartup.exe
-file=ABI_DIR\BUILD_DIR\t_sqldb64.exe                \test\t_sqldb64.exe
-file=ABI_DIR\BUILD_DIR\t_sqlfilesrvcrash1.exe       \test\t_sqlfilesrvcrash1.exe
-file=ABI_DIR\BUILD_DIR\t_sqlfilesrvcrash2.exe       \test\t_sqlfilesrvcrash2.exe
-file=ABI_DIR\BUILD_DIR\t_sqlcorrupt.exe             \test\t_sqlcorrupt.exe
-file=ABI_DIR\BUILD_DIR\t_sqlenvdestroy.exe          \test\t_sqlenvdestroy.exe
+file=ABI_DIR\BUILD_DIR\T_SQLENVCREATE.EXE	\TEST\T_SQLENVCREATE.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLITE.EXE		\TEST\T_SQLITE.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLAPI.EXE		\TEST\T_SQLAPI.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLAPI2.EXE		\TEST\T_SQLAPI2.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLPANIC.EXE		\TEST\T_SQLPANIC.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLLANG.EXE		\TEST\T_SQLLANG.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLOOM1.EXE		\TEST\T_SQLOOM1.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLOOM2.EXE		\TEST\T_SQLOOM2.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLOOM3.EXE		\TEST\T_SQLOOM3.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLOOM4.EXE		\TEST\T_SQLOOM4.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLOOM5.EXE		\TEST\T_SQLOOM5.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLOOM6.EXE		\TEST\T_SQLOOM6.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLMULTI.EXE		\TEST\T_SQLMULTI.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLCOLLATE.EXE		\TEST\T_SQLCOLLATE.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLTRANS.EXE		\TEST\T_SQLTRANS.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLLOAD.EXE		\TEST\T_SQLLOAD.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLGETFIRSTSTMT.EXE	\TEST\T_SQLGETFIRSTSTMT.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLSECURITY1.EXE	\TEST\T_SQLSECURITY1.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLSECURITY2.EXE	\TEST\T_SQLSECURITY2.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLSECURITY3.EXE	\TEST\T_SQLSECURITY3.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLSECURITY4.EXE	\TEST\T_SQLSECURITY4.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLSECURITY5.EXE	\TEST\T_SQLSECURITY5.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLSECURITY6.EXE	\TEST\T_SQLSECURITY6.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLATTACH.EXE		\TEST\T_SQLATTACH.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLATTACH2.EXE		\TEST\T_SQLATTACH2.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLPERFORMANCE.EXE	\TEST\T_SQLPERFORMANCE.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLPERFORMANCE2.EXE	\TEST\T_SQLPERFORMANCE2.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLPERFORMANCE3.EXE	\TEST\T_SQLPERFORMANCE3.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLPERFORMANCE4.EXE	\TEST\T_SQLPERFORMANCE4.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLPERFORMANCE5.EXE	\TEST\T_SQLPERFORMANCE5.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLOOD.EXE		\TEST\T_SQLOOD.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLOSLAYER.EXE		\TEST\T_SQLOSLAYER.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLDEFECT.EXE		\TEST\T_SQLDEFECT.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLDEFECT2.EXE		\TEST\T_SQLDEFECT2.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLPRIVCAGE.EXE	\TEST\T_SQLPRIVCAGE.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLBADCLIENT.EXE	\TEST\T_SQLBADCLIENT.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLBUR.EXE		\TEST\T_SQLBUR.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLSCALARFULLSELECT.EXE \TEST\T_SQLSCALARFULLSELECT.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLFSERR.EXE		\TEST\T_SQLFSERR.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLCONFIG.EXE		\TEST\T_SQLCONFIG.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLCONFIGFILE.EXE	\TEST\T_SQLCONFIGFILE.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLDBCONFIGFILE.EXE		\TEST\T_SQLDBCONFIGFILE.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLCOMPACT1.EXE	\TEST\T_SQLCOMPACT1.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLCOMPACT2.EXE	\TEST\T_SQLCOMPACT2.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLCOMPACT3.EXE	\TEST\T_SQLCOMPACT3.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLCOMPACT4.EXE	\TEST\T_SQLCOMPACT4.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLBLOB.EXE	\TEST\T_SQLBLOB.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLAUTHORIZER.EXE \TEST\T_SQLAUTHORIZER.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLFILEBUF64.EXE 	\TEST\T_SQLFILEBUF64.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLSTARTUP.EXE 	\TEST\T_SQLSTARTUP.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLDB64.EXE	\TEST\T_SQLDB64.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLFILESRVCRASH1.EXE	\TEST\T_SQLFILESRVCRASH1.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLFILESRVCRASH2.EXE 	\TEST\T_SQLFILESRVCRASH2.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLCORRUPT.EXE 	\TEST\T_SQLCORRUPT.EXE
+file=ABI_DIR\BUILD_DIR\T_SQLENVDESTROY.EXE	\TEST\T_SQLENVDESTROY.EXE
 
 #endif
--- a/persistentstorage/sql/SQLite/pager.c	Wed Sep 15 14:05:58 2010 +0300
+++ b/persistentstorage/sql/SQLite/pager.c	Wed Oct 13 16:30:44 2010 +0300
@@ -3062,15 +3062,15 @@
     assert( p->dirty );
     p->dirty = 0;
   }
-
-  /* If the file has not yet been opened, open it now. */
-  if( !pPager->fd->pMethods ){
-    assert(pPager->tempFile);
-	rc = sqlite3PagerOpentemp(pPager, pPager->fd, pPager->vfsFlags);
-	if( rc ) return rc;
-  }
-
   while( pList ){
+
+    /* If the file has not yet been opened, open it now. */
+    if( !pPager->fd->pMethods ){
+      assert(pPager->tempFile);
+      rc = sqlite3PagerOpentemp(pPager, pPager->fd, pPager->vfsFlags);
+      if( rc ) return rc;
+    }
+
     /* If there are dirty pages in the page cache with page numbers greater
     ** than Pager.dbSize, this means sqlite3PagerTruncate() was called to
     ** make the file smaller (presumably by auto-vacuum code). Do not write
@@ -3655,7 +3655,7 @@
    || MEMDB
    || (pPager->lru.pFirstSynced==0 && pPager->doNotSync)
   ){
-    void *pData = 0;                   /* Initialized to placate warning */
+    void *pData;
     if( pPager->nPage>=pPager->nHash ){
       pager_resize_hash_table(pPager,
          pPager->nHash<256 ? 256 : pPager->nHash*2);
--- a/persistentstorage/sql/SRC/Server/Compact/SqlCompactEntry.cpp	Wed Sep 15 14:05:58 2010 +0300
+++ b/persistentstorage/sql/SRC/Server/Compact/SqlCompactEntry.cpp	Wed Oct 13 16:30:44 2010 +0300
@@ -213,6 +213,10 @@
 	if(err == KErrNone)
 		{
 		iPageCount -= processedPageCount;
+		if(processedPageCount == 0)
+            {
+            iPageCount = 0;
+            }
 		__SQLASSERT(iPageCount >= 0, ESqlPanicInternalError);
 		}
 	TBool stopCompaction = err == KSqlErrCorrupt || err == KSqlErrNotDb || err == KErrCorrupt || err == KErrDisMounted;
--- a/persistentstorage/sql/SRC/Server/SqlBur.cpp	Wed Sep 15 14:05:58 2010 +0300
+++ b/persistentstorage/sql/SRC/Server/SqlBur.cpp	Wed Oct 13 16:30:44 2010 +0300
@@ -624,8 +624,9 @@
 						// if we got here, we have a backup of the original database in .db.bak
 						// and the new database in .db
 						}//end of for(...)
+
 					__SQLLEAVE_IF_ERROR(err2);
-					
+
 					// clean up dir
 					//delete dir;
 					CleanupStack::PopAndDestroy(dir);
--- a/persistentstorage/sql/SRC/Server/SqlSrvResourceProfiler.cpp	Wed Sep 15 14:05:58 2010 +0300
+++ b/persistentstorage/sql/SRC/Server/SqlSrvResourceProfiler.cpp	Wed Oct 13 16:30:44 2010 +0300
@@ -78,10 +78,10 @@
 static TBool TheSqlSrvProfilerTraceToFile = EFalse;
 
 //"Prepared" and "Executed" SQL statement counters
-static TInt TheSqlSrvProfilerPreparedCnt8 = 0;
-static TInt TheSqlSrvProfilerPreparedCnt16 = 0;
-static TInt TheSqlSrvProfilerExecutedCnt8 = 0;
-static TInt TheSqlSrvProfilerExecutedCnt16 = 0;
+static TInt TheSqlSrvProfilerPreparedCnt8;
+static TInt TheSqlSrvProfilerPreparedCnt16;
+static TInt TheSqlSrvProfilerExecutedCnt8;
+static TInt TheSqlSrvProfilerExecutedCnt16;
 
 ///////////////////////////////// IPC counters ///////////////////////////////////////
 
--- a/persistentstorage/sql/SRC/Server/SqlSrvStatement.inl	Wed Sep 15 14:05:58 2010 +0300
+++ b/persistentstorage/sql/SRC/Server/SqlSrvStatement.inl	Wed Oct 13 16:30:44 2010 +0300
@@ -87,8 +87,7 @@
 	__SQLASSERT(iBufType == HSqlSrvStmtParamBuf::EBufSimpleBind, ESqlPanicInternalError);
 	iBuf->ResizeL(aData.Length());
 	iBuf->Write(0, aData);
-	//If the size is 0, then return KNullDesC8, where an empty string is hold, not a null one ("" instead of NULL)
-	return iBuf->Size() == 0 ? KNullDesC8() : iBuf->Ptr(0);
+	return iBuf->Ptr(0);
 	}
 
 /**
@@ -101,8 +100,7 @@
 inline const TPtrC8 HSqlSrvStmtParamBuf::Data() const
 	{
 	__SQLASSERT(iBuf != NULL, ESqlPanicInvalidObj);
-	//If the size is 0, then return KNullDesC8, where an empty string is hold, not a null one ("" instead of NULL)
-	return iBuf->Size() == 0 ? KNullDesC8() : iBuf->Ptr(0);
+	return iBuf->Ptr(0);
 	}
 
 /**
--- a/persistentstorage/sql/TEST/t_sqlcompact2.cpp	Wed Sep 15 14:05:58 2010 +0300
+++ b/persistentstorage/sql/TEST/t_sqlcompact2.cpp	Wed Oct 13 16:30:44 2010 +0300
@@ -25,6 +25,7 @@
 #include "SqlCompact.h"
 #include "SqlCompactConn.h"
 #include "SqlCompactEntry.h"
+#include "SqlUtil.h"
 
 const TInt KOperationCount = 20;
 const TInt KFreePageThresholdKb = 5;
@@ -220,6 +221,7 @@
 	void OomTest();
 	void FileIoErrTest();
 	void PerformanceTest();
+	void FreePageUpdateTest();
 	
 protected:		
 	virtual void DoCancel();
@@ -232,6 +234,8 @@
 	void Schedule(TCommand aNextCommand, TTimeIntervalMicroSeconds32 aInterval);
 
 	void CreateTestDatabase();
+	void CreateTestDatabase2();
+	void PrepareDb(TBool aDeleteRecords);
 	void InsertTestRecords(TInt aOpCount = KOperationCount);
 	void UpdateTestRecords(TInt aOpCount = KOperationCount);
 	void DeleteTestRecords(TInt aOpCount = KOperationCount);
@@ -390,6 +394,52 @@
 		::FinalizeStmtHandle(stmtHandle);
 		}
 	}
+	
+//Creates a test database (with KDbName name). The page size is 1KB. 	
+void CSqlCompactTestActive::CreateTestDatabase2()
+    {
+    //Create the database
+    const TInt KPageSize = 1024;
+    _LIT8(KConfigStr, "page_size=");
+    TBuf8<100> config;
+    config.Copy(KConfigStr);
+    config.AppendNum(KPageSize);
+    TInt err = KErrNone;
+    err = ::CreateDbHandle8(::FileNameZ8(TheDbName), TheDbHandle);
+    TEST2(err, KErrNone);  
+    _LIT8(KCreateTableSql, "CREATE TABLE A(I INTEGER, T TEXT)\x0");
+    err = ::DbExecStmt8(TheDbHandle, KCreateTableSql);
+    TEST2(err, KErrNone);
+    }
+	
+// Inserts 1000 records.
+// The record size is such that there are only two records per page.
+void CSqlCompactTestActive::PrepareDb(TBool aDeleteRecords)
+    {
+    //Insert records
+    const TInt KRecordCount = 1000;
+    const TInt KTextLen = 400;
+    TBuf<KTextLen> TheText;
+    TBuf<KTextLen + 100> TheSqlBuf;
+    TheText.SetLength(TheText.MaxLength());
+    TheText.Fill(TChar('A'));
+    for(TInt i=0;i<KRecordCount;++i)
+        {
+        TheSqlBuf.Format(_L("INSERT INTO A VALUES(%d, '%S')"), i + 1, &TheText);
+        _LIT(KZero, "\x0");
+        TheSqlBuf.Append(KZero);
+        TInt err = ::DbExecStmt16(TheDbHandle, TheSqlBuf);
+        TEST2(err, KErrNone);
+        }
+    if(aDeleteRecords)
+        {   
+        //Delete all records to make a lot of free pages. 
+        _LIT(KDeleteAll, "DELETE FROM A WHERE 1\x0");
+        TheSqlBuf = KDeleteAll;
+        TInt err = ::DbExecStmt16(TheDbHandle, TheSqlBuf);
+        TEST2(err, KErrNone);
+        }
+    }
 
 void CSqlCompactTestActive::UpdateTestRecords(TInt aOpCount)
 	{
@@ -919,6 +969,51 @@
 	PrintInfo(processedPages, KMediaTypeNames[driveInfo.iType], start, end);
 	}
 
+/**
+@SYMTestCaseID          PDS-SQL-CT-4239
+@SYMTestCaseDesc        Free page update test.
+                        The test creates a database with some records and deletes them all. The records are inserted such that when
+                        they get deleted, it leaves a great deal of free pages.
+                        Then the test refill the pages which ware empty. After that, the test call ::DbCompact(...) with the number of free
+                        pages previously. The free page count should be updated with "0" since all free pages have been refilled since. 
+@SYMTestPriority        Medium
+@SYMTestExpectedResults Test must not fail
+*/
+void CSqlCompactTestActive::FreePageUpdateTest()
+    {
+     (void)TheFs.Delete(TheDbName);
+    
+    //Create the database 
+    CreateTestDatabase2();
+    
+    CSqlCompactor* compactor = NULL;
+    TRAPD(err, compactor = CSqlCompactor::NewL(&SqlCreateCompactConnL, KCompactStepInterval));
+    TEST2(err, KErrNone);
+    TRAP(err, compactor->AddEntryL(TheDbName, TheCompactionSettings));
+    TEST2(err, KErrNone);
+	
+	//Insert 1000 records and then delete all of them
+    PrepareDb(ETrue);
+    TInt freePageCount = ::FreePageCount();
+    TEST(freePageCount > KSqlCompactFreePageThresholdKb);
+    TheTest.Printf(_L("   Free pages count = %d\r\n"), freePageCount);
+  
+    //Refill the database
+    PrepareDb(EFalse);
+   
+    CSqlCompactEntry* impl = compactor->iEntries[0];
+    impl->iPageCount = freePageCount;
+    err = impl->Compact();
+    TEST2(err, KErrNone);
+    TEST2(impl->iPageCount, 0);
+
+    compactor->ReleaseEntry(TheDbName);
+    delete compactor;
+    ::CloseDbHandle(TheDbHandle);
+    TheDbHandle = NULL;
+    (void)TheFs.Delete(TheDbName);
+    }
+
 //////////////////////////////////////////////////////////////////////////////////////////////////
 
 void DoTests()
@@ -939,6 +1034,9 @@
 
 	TheTest.Next(_L(" @SYMTestCaseID:SYSLIB-SQL-UT-4052 Compaction - performance test"));
 	TheTestActive->PerformanceTest();
+	
+	TheTest.Next(_L(" @SYMTestCaseID:PDS-SQL-CT-4239 Free page update test"));
+	TheTestActive->FreePageUpdateTest();
 
 	CActiveScheduler::Start();
 	
--- a/persistentstorage/sql/TEST/t_sqldefect2.cpp	Wed Sep 15 14:05:58 2010 +0300
+++ b/persistentstorage/sql/TEST/t_sqldefect2.cpp	Wed Oct 13 16:30:44 2010 +0300
@@ -416,93 +416,6 @@
     TEST2(err, KErrAlreadyExists);
     }
 
-/**
-@SYMTestCaseID          PDS-SQL-CT-4213
-@SYMTestCaseDesc        Tests the ability of the SQL server to store empty strings and retrieve them as 
-						text column values, not NULLs.
-						Change: ou1cimx1#504388. 
-@SYMTestPriority        High
-@SYMTestActions         The test creates a database and a table and stores there empty strings.
-						Then the test retrieves the stored column values and verifies that the column type is
-						"text", not "null".
-@SYMTestExpectedResults Test must not fail
-*/
-void EmptyTextColumnTest()
-	{
-	_LIT8(KEncUtf16, "encoding=\"UTF-16\"");
-	_LIT8(KEncUtf8, "encoding=\"UTF-8\"");
-	TPtrC8 enc[] = {KEncUtf16(), KEncUtf8()};
-	for(TInt i=0;i<(sizeof(enc)/sizeof(enc[0]));++i)
-		{
-		(void)RSqlDatabase::Delete(KTestDatabase1);
-		TInt err = TheDb1.Create(KTestDatabase1, &enc[i]);
-		TEST2(err, KErrNone);
-		//Insert records with empty text column values using RSqlDatabase::Exec()
-	    err = TheDb1.Exec(_L("CREATE TABLE A(ID INTEGER, T TEXT)"));
-	    TEST(err >= 0);
-	    err = TheDb1.Exec(_L("INSERT INTO A VALUES(1, '')"));
-	    TEST2(err, 1);
-	    err = TheDb1.Exec(_L8("INSERT INTO A VALUES(2, '')"));
-	    TEST2(err, 1);
-		//Insert a record with empty text column value using RSqlParamWriteStream
-	    RSqlStatement stmt;
-	    err = stmt.Prepare(TheDb1, _L("INSERT INTO A(ID, T) VALUES(:P1, :P2)"));
-	    TEST2(err, KErrNone);
-		err = stmt.BindInt(0, 3);
-	    TEST2(err, KErrNone);
-	    RSqlParamWriteStream strm;
-	    err = strm.BindText(stmt, 1);
-	    TEST2(err, KErrNone);
-	    TRAP(err, strm.WriteL(KNullDesC));
-	    TEST2(err, KErrNone);
-	    strm.Close();
-	    err = stmt.Exec();
-	    TEST2(err, 1);
-	    stmt.Close();
-		//Insert records with empty text column values using RSqlStatement::Bind()
-	    err = stmt.Prepare(TheDb1, _L("INSERT INTO A(ID, T) VALUES(:P1, :P2)"));
-	    TEST2(err, KErrNone);
-		err = stmt.BindInt(0, 4);
-	    TEST2(err, KErrNone);
-		err = stmt.BindText(1, KNullDesC);
-	    TEST2(err, KErrNone);
-	    err = stmt.Exec();
-	    TEST2(err, 1);
-	    //
-	    err = stmt.Reset();
-	    TEST2(err, KErrNone);
-		err = stmt.BindInt(0, 5);
-	    TEST2(err, KErrNone);
-	    _LIT(KEmptyStr, "");
-		err = stmt.BindText(1, KEmptyStr);
-	    TEST2(err, KErrNone);
-	    err = stmt.Exec();
-	    TEST2(err, 1);
-	    stmt.Close();
-	    //Read the empty text column values
-	    err = stmt.Prepare(TheDb1, _L("SELECT T FROM A"));
-	    TEST2(err, KErrNone);
-	    TInt cnt = 0;
-	    while((err = stmt.Next()) == KSqlAtRow)
-	    	{
-			++cnt;
-			TPtrC val;
-			err = stmt.ColumnText(0, val);
-			TEST2(err, KErrNone);
-			TEST2(val.Length(), 0);
-			TSqlColumnType type = stmt.ColumnType(0);
-			TEST2(type, ESqlText);
-	    	}
-	    stmt.Close();
-	    TEST2(err, KSqlAtEnd);
-	    TEST2(cnt, 5);
-	    //
-	    TheDb1.Close();
-	    err = RSqlDatabase::Delete(KTestDatabase1);
-	    TEST2(err, KErrNone);
-		}
-	}
-
 void DoTestsL()
 	{
 	TheTest.Start(_L(" @SYMTestCaseID:SYSLIB-SQL-CT-4154 DEF143062: SQL, \"CREATE INDEX\" sql crashes SQL server"));
@@ -520,9 +433,6 @@
     TheTest.Next(_L(" @SYMTestCaseID:SYSLIB-SQL-CT-4211 Temp files created during sql operations are not deleted after rebooting the phone - 2"));
     TempFileTest();
     
-    TheTest.Next(_L(" @SYMTestCaseID:PDS-SQL-CT-4213 No support to store an empty string in symbian's sqlite."));
-    EmptyTextColumnTest();
-
     TheTest.Next(_L(" @SYMTestCaseID:SYSLIB-SQL-CT-4214 After *#7370# Java apps are not preinstalled again"));
     DeleteTempFolder();
 	}
--- a/persistentstorage/sql/TEST/t_sqlload.cpp	Wed Sep 15 14:05:58 2010 +0300
+++ b/persistentstorage/sql/TEST/t_sqlload.cpp	Wed Oct 13 16:30:44 2010 +0300
@@ -60,9 +60,6 @@
 //Binary data length
 const TInt KBinDataLen = 2003;
 
-//StatementMaxNumberTest() time limit in seconds.
-const TInt KTestTimeLimit = 60;//seconds
-
 ///////////////////////////////////////////////////////////////////////////////////////
 
 void DeleteTestFiles()
@@ -127,8 +124,8 @@
 ///////////////////////////////////////////////////////////////////////////////////////
 
 //StatementMaxNumberTest() timeouts in WDP builds.
-//This function is used return the seconds passed from the start of the test case.
-TTimeIntervalSeconds ExecutionTimeSeconds()
+//This function is used to check whether the time limit is reaqched or not.
+TBool IsTimeLimitReached()
 	{
 	struct TStartTime
 		{
@@ -140,6 +137,7 @@
 		};
 	
 	static TStartTime startTime; 
+	const TInt KTestTimeLimit = 150;//seconds
 	
 	TTime currTime;
 	currTime.HomeTime();
@@ -147,7 +145,7 @@
 	TTimeIntervalSeconds s;
 	TInt err = currTime.SecondsFrom(startTime.iTime, s);
 	TEST2(err, KErrNone);
-	return s;
+	return s.Int() > KTestTimeLimit;
 	}
 
 void CreateTestDir()
@@ -616,9 +614,8 @@
 		if((idx % 100) == 0)
 			{
 			GetHomeTimeAsString(time);
-			TTimeIntervalSeconds s = ExecutionTimeSeconds();
-			TheTest.Printf(_L("=== %S: Create % 5d statements. %d seconds.\r\n"), &time, idx + 1, s.Int());
-			if(s.Int() > KTestTimeLimit)
+			TheTest.Printf(_L("=== %S: Create % 5d statements\r\n"), &time, idx + 1);
+			if(IsTimeLimitReached())
 				{
 				TheTest.Printf(_L("=== %S: The time limit reached.\r\n"), &time);
 				++idx;//The idx-th statement is valid, the statement count is idx + 1.
@@ -652,13 +649,12 @@
 		TEST2(err, KSqlAtRow);
 		err = stmt[idx].Next();
 		TEST2(err, KSqlAtEnd);
-		GetHomeTimeAsString(time);
-		TTimeIntervalSeconds s = ExecutionTimeSeconds();
 		if((j % 100) == 0)
 			{
-			TheTest.Printf(_L("=== %S: % 5d statements processed. %d seconds.\r\n"), &time, j + 1, s.Int());
+			GetHomeTimeAsString(time);
+			TheTest.Printf(_L("=== %S: % 5d statements processed\r\n"), &time, j + 1);
 			}
-		if(s.Int() > KTestTimeLimit)
+		if(IsTimeLimitReached())
 			{
 			TheTest.Printf(_L("=== %S: The time limit reached.\r\n"), &time);
 			break;
--- a/persistentstorage/sql/TEST/t_sqloslayer.cpp	Wed Sep 15 14:05:58 2010 +0300
+++ b/persistentstorage/sql/TEST/t_sqloslayer.cpp	Wed Oct 13 16:30:44 2010 +0300
@@ -403,7 +403,7 @@
 	TUint32 end = User::FastCounter();
 	TInt ms = CalcMs(start, end);
 	TheTest.Printf(_L(" === sqlite3OsSleep() time=%d ms\r\n"), ms);
-	//TEST(ms >= 80 && ms <= 320);// -60%..+60%
+	TEST(ms >= 80 && ms <= 320);// -60%..+60%
 	}
 
 //Lock/unlock tests
--- a/persistentstorage/sql/TEST/t_sqlperformance.cpp	Wed Sep 15 14:05:58 2010 +0300
+++ b/persistentstorage/sql/TEST/t_sqlperformance.cpp	Wed Oct 13 16:30:44 2010 +0300
@@ -1174,10 +1174,12 @@
 	
 void SelectLikeQueryPerfTest()
 {
+	_LIT(KTestDatabase1, "c:\\test\\t_sqldefect_1.db");
+	
 	_LIT8(KServerConfigString1, "encoding =  \"UTF-8\"");
 	//create a sql db file
-	(void)RSqlDatabase::Delete(TheNonSecureDbName);
-	TInt err = TheDb.Create(TheNonSecureDbName, &KServerConfigString1);
+	(void)RSqlDatabase::Delete(KTestDatabase1);
+	TInt err = TheDb.Create(KTestDatabase1, &KServerConfigString1);
 	TEST2(err, KErrNone);
 	
 	//Create a test table and insert some records
@@ -1186,12 +1188,12 @@
 	
 	//Add 100 records to the table
 	for(TInt k=0;k<100;++k)
-		{
-		TBuf<100> sql;
-		sql.Format(_L("INSERT INTO A VALUES(%d, 'Dvorák')"), k + 1);
-		err = TheDb.Exec(sql);
-		TEST2(err, 1);
-		}
+	{
+	TBuf<100> sql;
+	sql.Format(_L("INSERT INTO A VALUES(%d, 'Dvorák')"), k + 1);
+	err = TheDb.Exec(sql);
+	TEST2(err, 1);
+	}
 	
 	//Update one record  
 	err = TheDb.Exec(_L("UPDATE A SET Name='dvorak1' WHERE ID = 50"));
@@ -1216,7 +1218,7 @@
 	PrintStats(start, end);
 	
 	TheDb.Close();
-	(void)RSqlDatabase::Delete(TheNonSecureDbName);
+	(void)RSqlDatabase::Delete(KTestDatabase1);
 }
 
 ///////////////////////////////////////////////////////////////////////////////////
--- a/persistentstorage/sql/TEST/t_sqlperformance4.cpp	Wed Sep 15 14:05:58 2010 +0300
+++ b/persistentstorage/sql/TEST/t_sqlperformance4.cpp	Wed Oct 13 16:30:44 2010 +0300
@@ -9,7 +9,6 @@
 // Nokia Corporation - initial contribution.
 //
 // Contributors:
-// NTT DOCOMO, INC - Fix for Bug 3170 "SQL library test T_SQLPERFORMANCE4 fails with USER 84 panic"
 //
 // Description:
 //
@@ -301,12 +300,7 @@
 			{
 			break;//No more SQL statements
 			}
-		TInt stmtLength = eolPos;
-		while (stmtLength > 0 && (sql[stmtLength-1] == '\r'))
-			{
-			--stmtLength; //Reduce length to remove carriage return characters from the end of the statement string
-			}
-		TPtrC8 sqlStmt8(sql.Ptr(), stmtLength);
+		TPtrC8 sqlStmt8(sql.Ptr(), eolPos - 1);//"eolPos - 1" - to cut off the '\r' character
 		TPtrC8 ptr = sql.Mid(eolPos + 1);//"eolPos + 1" - first character after '\n'
 		sql.Set(const_cast <TUint8*> (ptr.Ptr()), ptr.Length(), ptr.Length());
 		++recordCount;
--- a/persistentstorage/sql/TEST/t_sqlperformance5.cpp	Wed Sep 15 14:05:58 2010 +0300
+++ b/persistentstorage/sql/TEST/t_sqlperformance5.cpp	Wed Oct 13 16:30:44 2010 +0300
@@ -296,7 +296,7 @@
 	delete thumbnailBuf;
 	}
 
-void FlushTempTables()
+void FlushTemptTables()
 	{
 	TUint32 fc1 = User::FastCounter();
 	
@@ -358,7 +358,7 @@
 	TEST2(err, KErrNone);
 	
 	PoulateTempTables(stmt1, stmt2);
-	FlushTempTables();
+	FlushTemptTables();
 	
 	stmt2.Close();
 	stmt1.Close();
--- a/persistentstorage/sqlite3api/GROUP/BLD.INF	Wed Sep 15 14:05:58 2010 +0300
+++ b/persistentstorage/sqlite3api/GROUP/BLD.INF	Wed Oct 13 16:30:44 2010 +0300
@@ -37,411 +37,410 @@
 ../GROUP/sqlite3tests.bat                      z:/test/sqlite3tests.bat
 ../GROUP/config.ini                            z:/test/config.ini
 
-../TEST/TclScript/speed1p.explain			z:/private/10285a82/speed1p.explain
-../TEST/TclScript/speed4p.explain			z:/private/10285a82/speed4p.explain
-../TEST/TclScript/fuzz_common.tcl			z:/private/10285a82/fuzz_common.tcl
-../TEST/TclScript/malloc_common.tcl			z:/private/10285a82/malloc_common.tcl
-../TEST/TclScript/tester.tcl				z:/private/10285a82/tester.tcl
-../TEST/TclScript/thread_common.tcl			z:/private/10285a82/thread_common.tcl
-../TEST/TclScript/trans2.test.gz			z:/private/10285a82/trans2.test.gz
-../TEST/TclScript/aggerror.test				z:/private/10285a82/aggerror.test
-../TEST/TclScript/alias.test				z:/private/10285a82/alias.test
-../TEST/TclScript/all.test					z:/private/10285a82/all.test
-../TEST/TclScript/alter.test				z:/private/10285a82/alter.test
-../TEST/TclScript/alter2.test				z:/private/10285a82/alter2.test
-../TEST/TclScript/alter3.test				z:/private/10285a82/alter3.test
-../TEST/TclScript/altermalloc.test			z:/private/10285a82/altermalloc.test
-../TEST/TclScript/analyze.test				z:/private/10285a82/analyze.test
-../TEST/TclScript/async.test				z:/private/10285a82/async.test
-../TEST/TclScript/async2.test				z:/private/10285a82/async2.test
-../TEST/TclScript/async3.test				z:/private/10285a82/async3.test
-../TEST/TclScript/attach.test				z:/private/10285a82/attach.test
-../TEST/TclScript/attach2.test				z:/private/10285a82/attach2.test
-../TEST/TclScript/attach3.test				z:/private/10285a82/attach3.test
-../TEST/TclScript/attachmalloc.test			z:/private/10285a82/attachmalloc.test
-../TEST/TclScript/auth.test					z:/private/10285a82/auth.test
-../TEST/TclScript/auth2.test				z:/private/10285a82/auth2.test
-../TEST/TclScript/autoinc.test				z:/private/10285a82/autoinc.test
-../TEST/TclScript/autovacuum.test			z:/private/10285a82/autovacuum.test
-../TEST/TclScript/autovacuum_ioerr2.test	z:/private/10285a82/autovacuum_ioerr2.test
-../TEST/TclScript/avtrans.test			z:/private/10285a82/avtrans.test
-../TEST/TclScript/badutf.test			z:/private/10285a82/badutf.test
-../TEST/TclScript/between.test			z:/private/10285a82/between.test
-../TEST/TclScript/bigfile.test			z:/private/10285a82/bigfile.test
-../TEST/TclScript/bigrow.test			z:/private/10285a82/bigrow.test
-../TEST/TclScript/bind.test				z:/private/10285a82/bind.test
-../TEST/TclScript/bindxfer.test			z:/private/10285a82/bindxfer.test
-../TEST/TclScript/bitvec.test			z:/private/10285a82/bitvec.test
-../TEST/TclScript/blob.test				z:/private/10285a82/blob.test
-../TEST/TclScript/busy.test				z:/private/10285a82/busy.test
-../TEST/TclScript/cache.test			z:/private/10285a82/cache.test
-../TEST/TclScript/capi2.test			z:/private/10285a82/capi2.test
-../TEST/TclScript/capi3.test			z:/private/10285a82/capi3.test
-../TEST/TclScript/capi3b.test			z:/private/10285a82/capi3b.test
-../TEST/TclScript/capi3c.test			z:/private/10285a82/capi3c.test
-../TEST/TclScript/capi3d.test			z:/private/10285a82/capi3d.test
-../TEST/TclScript/cast.test				z:/private/10285a82/cast.test
-../TEST/TclScript/check.test			z:/private/10285a82/check.test
-../TEST/TclScript/collate1.test			z:/private/10285a82/collate1.test
-../TEST/TclScript/collate2.test			z:/private/10285a82/collate2.test
-../TEST/TclScript/collate3.test			z:/private/10285a82/collate3.test
-../TEST/TclScript/collate4.test			z:/private/10285a82/collate4.test
-../TEST/TclScript/collate5.test			z:/private/10285a82/collate5.test
-../TEST/TclScript/collate6.test			z:/private/10285a82/collate6.test
-../TEST/TclScript/collate7.test			z:/private/10285a82/collate7.test
-../TEST/TclScript/collate8.test			z:/private/10285a82/collate8.test
-../TEST/TclScript/collate9.test			z:/private/10285a82/collate9.test
-../TEST/TclScript/collateA.test			z:/private/10285a82/collatea.test
-../TEST/TclScript/colmeta.test			z:/private/10285a82/colmeta.test
-../TEST/TclScript/colname.test			z:/private/10285a82/colname.test
-../TEST/TclScript/conflict.test			z:/private/10285a82/conflict.test
-../TEST/TclScript/corrupt.test			z:/private/10285a82/corrupt.test
-../TEST/TclScript/corrupt2.test			z:/private/10285a82/corrupt2.test
-../TEST/TclScript/corrupt3.test			z:/private/10285a82/corrupt3.test
-../TEST/TclScript/corrupt4.test			z:/private/10285a82/corrupt4.test
-../TEST/TclScript/corrupt5.test			z:/private/10285a82/corrupt5.test
-../TEST/TclScript/corrupt6.test			z:/private/10285a82/corrupt6.test
-../TEST/TclScript/corrupt7.test			z:/private/10285a82/corrupt7.test
-../TEST/TclScript/corrupt8.test			z:/private/10285a82/corrupt8.test
-../TEST/TclScript/corrupt9.test			z:/private/10285a82/corrupt9.test
-../TEST/TclScript/corruptA.test			z:/private/10285a82/corrupta.test
-../TEST/TclScript/crash.test			z:/private/10285a82/crash.test
-../TEST/TclScript/crash2.test			z:/private/10285a82/crash2.test
-../TEST/TclScript/crash3.test			z:/private/10285a82/crash3.test
-../TEST/TclScript/crash4.test			z:/private/10285a82/crash4.test
-../TEST/TclScript/crash5.test			z:/private/10285a82/crash5.test
-../TEST/TclScript/crash6.test			z:/private/10285a82/crash6.test
-../TEST/TclScript/crash7.test			z:/private/10285a82/crash7.test
-../TEST/TclScript/createtab.test		z:/private/10285a82/createtab.test
-../TEST/TclScript/cse.test				z:/private/10285a82/cse.test
-../TEST/TclScript/date.test				z:/private/10285a82/date.test
-../TEST/TclScript/default.test			z:/private/10285a82/default.test
-../TEST/TclScript/delete.test			z:/private/10285a82/delete.test
-../TEST/TclScript/delete2.test			z:/private/10285a82/delete2.test
-../TEST/TclScript/delete3.test			z:/private/10285a82/delete3.test
-../TEST/TclScript/descidx1.test			z:/private/10285a82/descidx1.test
-../TEST/TclScript/descidx2.test			z:/private/10285a82/descidx2.test
-../TEST/TclScript/descidx3.test			z:/private/10285a82/descidx3.test
-../TEST/TclScript/diskfull.test			z:/private/10285a82/diskfull.test
-../TEST/TclScript/distinctagg.test		z:/private/10285a82/distinctagg.test
-../TEST/TclScript/enc.test				z:/private/10285a82/enc.test
-../TEST/TclScript/enc2.test				z:/private/10285a82/enc2.test
-../TEST/TclScript/enc3.test				z:/private/10285a82/enc3.test
-../TEST/TclScript/eval.test				z:/private/10285a82/eval.test
-../TEST/TclScript/exclusive.test		z:/private/10285a82/exclusive.test
-../TEST/TclScript/exclusive2.test		z:/private/10285a82/exclusive2.test
-../TEST/TclScript/exec.test				z:/private/10285a82/exec.test
-../TEST/TclScript/expr.test				z:/private/10285a82/expr.test
-../TEST/TclScript/filectrl.test			z:/private/10285a82/filectrl.test
-../TEST/TclScript/filefmt.test			z:/private/10285a82/filefmt.test
-../TEST/TclScript/fkey1.test			z:/private/10285a82/fkey1.test
-../TEST/TclScript/format4.test			z:/private/10285a82/format4.test
-../TEST/TclScript/fts1a.test			z:/private/10285a82/fts1a.test
-../TEST/TclScript/fts1b.test			z:/private/10285a82/fts1b.test
-../TEST/TclScript/fts1c.test			z:/private/10285a82/fts1c.test
-../TEST/TclScript/fts1d.test			z:/private/10285a82/fts1d.test
-../TEST/TclScript/fts1e.test			z:/private/10285a82/fts1e.test
-../TEST/TclScript/fts1f.test			z:/private/10285a82/fts1f.test
-../TEST/TclScript/fts1i.test			z:/private/10285a82/fts1i.test
-../TEST/TclScript/fts1j.test			z:/private/10285a82/fts1j.test
-../TEST/TclScript/fts1k.test			z:/private/10285a82/fts1k.test
-../TEST/TclScript/fts1l.test			z:/private/10285a82/fts1l.test
-../TEST/TclScript/fts1m.test			z:/private/10285a82/fts1m.test
-../TEST/TclScript/fts1n.test			z:/private/10285a82/fts1n.test
-../TEST/TclScript/fts1o.test			z:/private/10285a82/fts1o.test
-../TEST/TclScript/fts1porter.test		z:/private/10285a82/fts1porter.test
-../TEST/TclScript/fts2.test				z:/private/10285a82/fts2.test
-../TEST/TclScript/fts2a.test			z:/private/10285a82/fts2a.test
-../TEST/TclScript/fts2b.test			z:/private/10285a82/fts2b.test
-../TEST/TclScript/fts2c.test			z:/private/10285a82/fts2c.test
-../TEST/TclScript/fts2d.test			z:/private/10285a82/fts2d.test
-../TEST/TclScript/fts2e.test			z:/private/10285a82/fts2e.test
-../TEST/TclScript/fts2f.test			z:/private/10285a82/fts2f.test
-../TEST/TclScript/fts2g.test			z:/private/10285a82/fts2g.test
-../TEST/TclScript/fts2h.test			z:/private/10285a82/fts2h.test
-../TEST/TclScript/fts2i.test			z:/private/10285a82/fts2i.test
-../TEST/TclScript/fts2j.test			z:/private/10285a82/fts2j.test
-../TEST/TclScript/fts2k.test			z:/private/10285a82/fts2k.test
-../TEST/TclScript/fts2l.test			z:/private/10285a82/fts2l.test
-../TEST/TclScript/fts2m.test			z:/private/10285a82/fts2m.test
-../TEST/TclScript/fts2n.test			z:/private/10285a82/fts2n.test
-../TEST/TclScript/fts2o.test			z:/private/10285a82/fts2o.test
-../TEST/TclScript/fts2p.test			z:/private/10285a82/fts2p.test
-../TEST/TclScript/fts2q.test			z:/private/10285a82/fts2q.test
-../TEST/TclScript/fts2r.test			z:/private/10285a82/fts2r.test
-../TEST/TclScript/fts2token.test		z:/private/10285a82/fts2token.test
-../TEST/TclScript/fts3.test				z:/private/10285a82/fts3.test
-../TEST/TclScript/fts3aa.test			z:/private/10285a82/fts3aa.test
-../TEST/TclScript/fts3ab.test			z:/private/10285a82/fts3ab.test
-../TEST/TclScript/fts3ac.test			z:/private/10285a82/fts3ac.test
-../TEST/TclScript/fts3ad.test			z:/private/10285a82/fts3ad.test
-../TEST/TclScript/fts3ae.test			z:/private/10285a82/fts3ae.test
-../TEST/TclScript/fts3af.test			z:/private/10285a82/fts3af.test
-../TEST/TclScript/fts3ag.test			z:/private/10285a82/fts3ag.test
-../TEST/TclScript/fts3ah.test			z:/private/10285a82/fts3ah.test
-../TEST/TclScript/fts3ai.test			z:/private/10285a82/fts3ai.test
-../TEST/TclScript/fts3aj.test			z:/private/10285a82/fts3aj.test
-../TEST/TclScript/fts3ak.test			z:/private/10285a82/fts3ak.test
-../TEST/TclScript/fts3al.test			z:/private/10285a82/fts3al.test
-../TEST/TclScript/fts3am.test			z:/private/10285a82/fts3am.test
-../TEST/TclScript/fts3an.test			z:/private/10285a82/fts3an.test
-../TEST/TclScript/fts3ao.test			z:/private/10285a82/fts3ao.test
-../TEST/TclScript/fts3atoken.test		z:/private/10285a82/fts3atoken.test
-../TEST/TclScript/fts3b.test			z:/private/10285a82/fts3b.test
-../TEST/TclScript/fts3c.test			z:/private/10285a82/fts3c.test
-../TEST/TclScript/fts3d.test			z:/private/10285a82/fts3d.test
-../TEST/TclScript/fts3e.test			z:/private/10285a82/fts3e.test
-../TEST/TclScript/fts3near.test			z:/private/10285a82/fts3near.test
-../TEST/TclScript/func.test				z:/private/10285a82/func.test
-../TEST/TclScript/fuzz.test				z:/private/10285a82/fuzz.test
-../TEST/TclScript/fuzz2.test			z:/private/10285a82/fuzz2.test
-../TEST/TclScript/fuzz_malloc.test		z:/private/10285a82/fuzz_malloc.test
-../TEST/TclScript/hook.test				z:/private/10285a82/hook.test
-../TEST/TclScript/icu.test				z:/private/10285a82/icu.test
-../TEST/TclScript/in.test				z:/private/10285a82/in.test
-../TEST/TclScript/in2.test				z:/private/10285a82/in2.test
-../TEST/TclScript/in3.test				z:/private/10285a82/in3.test
-../TEST/TclScript/incrblob.test			z:/private/10285a82/incrblob.test
-../TEST/TclScript/incrblob2.test		z:/private/10285a82/incrblob2.test
-../TEST/TclScript/incrblob_err.test		z:/private/10285a82/incrblob_err.test
-../TEST/TclScript/incrvacuum.test		z:/private/10285a82/incrvacuum.test
-../TEST/TclScript/incrvacuum2.test		z:/private/10285a82/incrvacuum2.test
-../TEST/TclScript/incrvacuum_ioerr.test	z:/private/10285a82/incrvacuum_ioerr.test
-../TEST/TclScript/index.test			z:/private/10285a82/index.test
-../TEST/TclScript/index2.test			z:/private/10285a82/index2.test
-../TEST/TclScript/index3.test			z:/private/10285a82/index3.test
-../TEST/TclScript/insert.test			z:/private/10285a82/insert.test
-../TEST/TclScript/insert2.test			z:/private/10285a82/insert2.test
-../TEST/TclScript/insert3.test			z:/private/10285a82/insert3.test
-../TEST/TclScript/insert4.test			z:/private/10285a82/insert4.test
-../TEST/TclScript/insert5.test			z:/private/10285a82/insert5.test
-../TEST/TclScript/interrupt.test		z:/private/10285a82/interrupt.test
-../TEST/TclScript/intpkey.test			z:/private/10285a82/intpkey.test
-../TEST/TclScript/io.test				z:/private/10285a82/io.test
-../TEST/TclScript/ioerr.test			z:/private/10285a82/ioerr.test
-../TEST/TclScript/ioerr2.test			z:/private/10285a82/ioerr2.test
-../TEST/TclScript/ioerr3.test			z:/private/10285a82/ioerr3.test
-../TEST/TclScript/ioerr4.test			z:/private/10285a82/ioerr4.test
-../TEST/TclScript/ioerr5.test			z:/private/10285a82/ioerr5.test
-../TEST/TclScript/join.test				z:/private/10285a82/join.test
-../TEST/TclScript/join2.test			z:/private/10285a82/join2.test
-../TEST/TclScript/join3.test			z:/private/10285a82/join3.test
-../TEST/TclScript/join4.test			z:/private/10285a82/join4.test
-../TEST/TclScript/join5.test			z:/private/10285a82/join5.test
-../TEST/TclScript/journal1.test			z:/private/10285a82/journal1.test
-../TEST/TclScript/jrnlmode.test			z:/private/10285a82/jrnlmode.test
-../TEST/TclScript/lastinsert.test		z:/private/10285a82/lastinsert.test
-../TEST/TclScript/laststmtchanges.test	z:/private/10285a82/laststmtchanges.test
-../TEST/TclScript/like.test				z:/private/10285a82/like.test
-../TEST/TclScript/like2.test			z:/private/10285a82/like2.test
-../TEST/TclScript/limit.test			z:/private/10285a82/limit.test
-../TEST/TclScript/loadext.test			z:/private/10285a82/loadext.test
-../TEST/TclScript/loadext2.test			z:/private/10285a82/loadext2.test
-../TEST/TclScript/lock.test				z:/private/10285a82/lock.test
-../TEST/TclScript/lock2.test			z:/private/10285a82/lock2.test
-../TEST/TclScript/lock3.test			z:/private/10285a82/lock3.test
-../TEST/TclScript/lock4.test			z:/private/10285a82/lock4.test
-../TEST/TclScript/lock5.test			z:/private/10285a82/lock5.test
-../TEST/TclScript/lookaside.test		z:/private/10285a82/lookaside.test
-../TEST/TclScript/main.test				z:/private/10285a82/main.test
-../TEST/TclScript/malloc.test			z:/private/10285a82/malloc.test
-../TEST/TclScript/malloc3.test			z:/private/10285a82/malloc3.test
-../TEST/TclScript/malloc4.test			z:/private/10285a82/malloc4.test
-../TEST/TclScript/malloc5.test			z:/private/10285a82/malloc5.test
-../TEST/TclScript/malloc6.test			z:/private/10285a82/malloc6.test
-../TEST/TclScript/malloc7.test			z:/private/10285a82/malloc7.test
-../TEST/TclScript/malloc8.test			z:/private/10285a82/malloc8.test
-../TEST/TclScript/malloc9.test			z:/private/10285a82/malloc9.test
-../TEST/TclScript/mallocA.test			z:/private/10285a82/malloca.test
-../TEST/TclScript/mallocAll.test		z:/private/10285a82/mallocall.test
-../TEST/TclScript/mallocB.test			z:/private/10285a82/mallocb.test
-../TEST/TclScript/mallocC.test			z:/private/10285a82/mallocc.test
-../TEST/TclScript/mallocD.test			z:/private/10285a82/mallocd.test
-../TEST/TclScript/mallocE.test			z:/private/10285a82/malloce.test
-../TEST/TclScript/mallocF.test			z:/private/10285a82/mallocf.test
-../TEST/TclScript/mallocG.test			z:/private/10285a82/mallocg.test
-../TEST/TclScript/mallocH.test			z:/private/10285a82/malloch.test
-../TEST/TclScript/mallocI.test			z:/private/10285a82/malloci.test
-../TEST/TclScript/manydb.test			z:/private/10285a82/manydb.test
-../TEST/TclScript/memdb.test			z:/private/10285a82/memdb.test
-../TEST/TclScript/memleak.test			z:/private/10285a82/memleak.test
-../TEST/TclScript/memsubsys1.test		z:/private/10285a82/memsubsys1.test
-../TEST/TclScript/memsubsys2.test		z:/private/10285a82/memsubsys2.test
-../TEST/TclScript/minmax.test			z:/private/10285a82/minmax.test
-../TEST/TclScript/minmax2.test			z:/private/10285a82/minmax2.test
-../TEST/TclScript/minmax3.test			z:/private/10285a82/minmax3.test
-../TEST/TclScript/misc1.test			z:/private/10285a82/misc1.test
-../TEST/TclScript/misc2.test			z:/private/10285a82/misc2.test
-../TEST/TclScript/misc3.test			z:/private/10285a82/misc3.test
-../TEST/TclScript/misc4.test			z:/private/10285a82/misc4.test
-../TEST/TclScript/misc5.test			z:/private/10285a82/misc5.test
-../TEST/TclScript/misc6.test			z:/private/10285a82/misc6.test
-../TEST/TclScript/misc7.test			z:/private/10285a82/misc7.test
-../TEST/TclScript/misuse.test			z:/private/10285a82/misuse.test
-../TEST/TclScript/mutex1.test			z:/private/10285a82/mutex1.test
-../TEST/TclScript/mutex2.test			z:/private/10285a82/mutex2.test
-../TEST/TclScript/nan.test				z:/private/10285a82/nan.test
-../TEST/TclScript/notnull.test			z:/private/10285a82/notnull.test
-../TEST/TclScript/null.test				z:/private/10285a82/null.test
-../TEST/TclScript/openv2.test			z:/private/10285a82/openv2.test
-../TEST/TclScript/pager.test			z:/private/10285a82/pager.test
-../TEST/TclScript/pager2.test			z:/private/10285a82/pager2.test
-../TEST/TclScript/pager3.test			z:/private/10285a82/pager3.test
-../TEST/TclScript/pageropt.test			z:/private/10285a82/pageropt.test
-../TEST/TclScript/pagesize.test			z:/private/10285a82/pagesize.test
-../TEST/TclScript/pcache.test			z:/private/10285a82/pcache.test
-../TEST/TclScript/permutations.test		z:/private/10285a82/permutations.test
-../TEST/TclScript/pragma.test			z:/private/10285a82/pragma.test
-../TEST/TclScript/pragma2.test			z:/private/10285a82/pragma2.test
-../TEST/TclScript/printf.test			z:/private/10285a82/printf.test
-../TEST/TclScript/progress.test			z:/private/10285a82/progress.test
-../TEST/TclScript/ptrchng.test			z:/private/10285a82/ptrchng.test
-../TEST/TclScript/quick.test			z:/private/10285a82/quick.test
-../TEST/TclScript/quote.test			z:/private/10285a82/quote.test
-../TEST/TclScript/rdonly.test			z:/private/10285a82/rdonly.test
-../TEST/TclScript/reindex.test			z:/private/10285a82/reindex.test
-../TEST/TclScript/rollback.test			z:/private/10285a82/rollback.test
-../TEST/TclScript/rowid.test			z:/private/10285a82/rowid.test
-../TEST/TclScript/rtree.test			z:/private/10285a82/rtree.test
-../TEST/TclScript/safety.test			z:/private/10285a82/safety.test
-../TEST/TclScript/schema.test			z:/private/10285a82/schema.test
-../TEST/TclScript/schema2.test			z:/private/10285a82/schema2.test
-../TEST/TclScript/select1.test			z:/private/10285a82/select1.test
-../TEST/TclScript/select2.test			z:/private/10285a82/select2.test
-../TEST/TclScript/select3.test			z:/private/10285a82/select3.test
-../TEST/TclScript/select4.test			z:/private/10285a82/select4.test
-../TEST/TclScript/select5.test			z:/private/10285a82/select5.test
-../TEST/TclScript/select6.test			z:/private/10285a82/select6.test
-../TEST/TclScript/select7.test			z:/private/10285a82/select7.test
-../TEST/TclScript/select8.test			z:/private/10285a82/select8.test
-../TEST/TclScript/select9.test			z:/private/10285a82/select9.test
-../TEST/TclScript/selectA.test			z:/private/10285a82/selecta.test
-../TEST/TclScript/selectB.test			z:/private/10285a82/selectb.test
-../TEST/TclScript/server1.test			z:/private/10285a82/server1.test
-../TEST/TclScript/shared.test			z:/private/10285a82/shared.test
-../TEST/TclScript/shared2.test			z:/private/10285a82/shared2.test
-../TEST/TclScript/shared3.test			z:/private/10285a82/shared3.test
-../TEST/TclScript/shared4.test			z:/private/10285a82/shared4.test
-../TEST/TclScript/shared_err.test		z:/private/10285a82/shared_err.test
-../TEST/TclScript/shortread1.test		z:/private/10285a82/shortread1.test
-../TEST/TclScript/sidedelete.test		z:/private/10285a82/sidedelete.test
-../TEST/TclScript/soak.test				z:/private/10285a82/soak.test
-../TEST/TclScript/softheap1.test		z:/private/10285a82/softheap1.test
-../TEST/TclScript/sort.test				z:/private/10285a82/sort.test
-../TEST/TclScript/speed1.test			z:/private/10285a82/speed1.test
-../TEST/TclScript/speed1p.test			z:/private/10285a82/speed1p.test
-../TEST/TclScript/speed2.test			z:/private/10285a82/speed2.test
-../TEST/TclScript/speed3.test			z:/private/10285a82/speed3.test
-../TEST/TclScript/speed4.test			z:/private/10285a82/speed4.test
-../TEST/TclScript/speed4p.test			z:/private/10285a82/speed4p.test
-../TEST/TclScript/sqllimits1.test		z:/private/10285a82/sqllimits1.test
-../TEST/TclScript/subquery.test			z:/private/10285a82/subquery.test
-../TEST/TclScript/subselect.test		z:/private/10285a82/subselect.test
-../TEST/TclScript/substr.test			z:/private/10285a82/substr.test
-../TEST/TclScript/sync.test				z:/private/10285a82/sync.test
-../TEST/TclScript/table.test			z:/private/10285a82/table.test
-../TEST/TclScript/tableapi.test			z:/private/10285a82/tableapi.test
-../TEST/TclScript/tclsqlite.test		z:/private/10285a82/tclsqlite.test
-../TEST/TclScript/tempdb.test			z:/private/10285a82/tempdb.test
-../TEST/TclScript/temptable.test		z:/private/10285a82/temptable.test
-../TEST/TclScript/thread001.test		z:/private/10285a82/thread001.test
-../TEST/TclScript/thread002.test		z:/private/10285a82/thread002.test
-../TEST/TclScript/thread003.test		z:/private/10285a82/thread003.test
-../TEST/TclScript/thread1.test			z:/private/10285a82/thread1.test
-../TEST/TclScript/thread2.test			z:/private/10285a82/thread2.test
-../TEST/TclScript/tkt1435.test			z:/private/10285a82/tkt1435.test
-../TEST/TclScript/tkt1443.test			z:/private/10285a82/tkt1443.test
-../TEST/TclScript/tkt1444.test			z:/private/10285a82/tkt1444.test
-../TEST/TclScript/tkt1449.test			z:/private/10285a82/tkt1449.test
-../TEST/TclScript/tkt1473.test			z:/private/10285a82/tkt1473.test
-../TEST/TclScript/tkt1501.test			z:/private/10285a82/tkt1501.test
-../TEST/TclScript/tkt1512.test			z:/private/10285a82/tkt1512.test
-../TEST/TclScript/tkt1514.test			z:/private/10285a82/tkt1514.test
-../TEST/TclScript/tkt1536.test			z:/private/10285a82/tkt1536.test
-../TEST/TclScript/tkt1537.test			z:/private/10285a82/tkt1537.test
-../TEST/TclScript/tkt1567.test			z:/private/10285a82/tkt1567.test
-../TEST/TclScript/tkt1644.test			z:/private/10285a82/tkt1644.test
-../TEST/TclScript/tkt1667.test			z:/private/10285a82/tkt1667.test
-../TEST/TclScript/tkt1873.test			z:/private/10285a82/tkt1873.test
-../TEST/TclScript/tkt2141.test			z:/private/10285a82/tkt2141.test
-../TEST/TclScript/tkt2192.test			z:/private/10285a82/tkt2192.test
-../TEST/TclScript/tkt2213.test			z:/private/10285a82/tkt2213.test
-../TEST/TclScript/tkt2251.test			z:/private/10285a82/tkt2251.test
-../TEST/TclScript/tkt2285.test			z:/private/10285a82/tkt2285.test
-../TEST/TclScript/tkt2332.test			z:/private/10285a82/tkt2332.test
-../TEST/TclScript/tkt2339.test			z:/private/10285a82/tkt2339.test
-../TEST/TclScript/tkt2391.test			z:/private/10285a82/tkt2391.test
-../TEST/TclScript/tkt2409.test			z:/private/10285a82/tkt2409.test
-../TEST/TclScript/tkt2450.test			z:/private/10285a82/tkt2450.test
-../TEST/TclScript/tkt2640.test			z:/private/10285a82/tkt2640.test
-../TEST/TclScript/tkt2643.test			z:/private/10285a82/tkt2643.test
-../TEST/TclScript/tkt2686.test			z:/private/10285a82/tkt2686.test
-../TEST/TclScript/tkt2767.test			z:/private/10285a82/tkt2767.test
-../TEST/TclScript/tkt2817.test			z:/private/10285a82/tkt2817.test
-../TEST/TclScript/tkt2820.test			z:/private/10285a82/tkt2820.test
-../TEST/TclScript/tkt2822.test			z:/private/10285a82/tkt2822.test
-../TEST/TclScript/tkt2832.test			z:/private/10285a82/tkt2832.test
-../TEST/TclScript/tkt2854.test			z:/private/10285a82/tkt2854.test
-../TEST/TclScript/tkt2920.test			z:/private/10285a82/tkt2920.test
-../TEST/TclScript/tkt2927.test			z:/private/10285a82/tkt2927.test
-../TEST/TclScript/tkt2942.test			z:/private/10285a82/tkt2942.test
-../TEST/TclScript/tkt3080.test			z:/private/10285a82/tkt3080.test
-../TEST/TclScript/tkt3093.test			z:/private/10285a82/tkt3093.test
-../TEST/TclScript/tkt3121.test			z:/private/10285a82/tkt3121.test
-../TEST/TclScript/tkt3201.test			z:/private/10285a82/tkt3201.test
-../TEST/TclScript/tkt3292.test			z:/private/10285a82/tkt3292.test
-../TEST/TclScript/tkt3298.test			z:/private/10285a82/tkt3298.test
-../TEST/TclScript/tkt3334.test			z:/private/10285a82/tkt3334.test
-../TEST/TclScript/tokenize.test			z:/private/10285a82/tokenize.test
-../TEST/TclScript/trace.test			z:/private/10285a82/trace.test
-../TEST/TclScript/trans.test			z:/private/10285a82/trans.test
-../TEST/TclScript/trans2.test			z:/private/10285a82/trans2.test
-../TEST/TclScript/trigger1.test			z:/private/10285a82/trigger1.test
-../TEST/TclScript/trigger2.test			z:/private/10285a82/trigger2.test
-../TEST/TclScript/trigger3.test			z:/private/10285a82/trigger3.test
-../TEST/TclScript/trigger4.test			z:/private/10285a82/trigger4.test
-../TEST/TclScript/trigger5.test			z:/private/10285a82/trigger5.test
-../TEST/TclScript/trigger6.test			z:/private/10285a82/trigger6.test
-../TEST/TclScript/trigger7.test			z:/private/10285a82/trigger7.test
-../TEST/TclScript/trigger8.test			z:/private/10285a82/trigger8.test
-../TEST/TclScript/trigger9.test			z:/private/10285a82/trigger9.test
-../TEST/TclScript/triggerA.test			z:/private/10285a82/triggera.test
-../TEST/TclScript/triggerB.test			z:/private/10285a82/triggerb.test
-../TEST/TclScript/types.test			z:/private/10285a82/types.test
-../TEST/TclScript/types2.test			z:/private/10285a82/types2.test
-../TEST/TclScript/types3.test			z:/private/10285a82/types3.test
-../TEST/TclScript/unique.test			z:/private/10285a82/unique.test
-../TEST/TclScript/update.test			z:/private/10285a82/update.test
-../TEST/TclScript/utf16align.test		z:/private/10285a82/utf16align.test
-../TEST/TclScript/vacuum.test			z:/private/10285a82/vacuum.test
-../TEST/TclScript/vacuum2.test			z:/private/10285a82/vacuum2.test
-../TEST/TclScript/vacuum3.test			z:/private/10285a82/vacuum3.test
-../TEST/TclScript/varint.test			z:/private/10285a82/varint.test
-../TEST/TclScript/veryquick.test		z:/private/10285a82/veryquick.test
-../TEST/TclScript/view.test				z:/private/10285a82/view.test
-../TEST/TclScript/vtab1.test			z:/private/10285a82/vtab1.test
-../TEST/TclScript/vtab2.test			z:/private/10285a82/vtab2.test
-../TEST/TclScript/vtab3.test			z:/private/10285a82/vtab3.test
-../TEST/TclScript/vtab4.test			z:/private/10285a82/vtab4.test
-../TEST/TclScript/vtab5.test			z:/private/10285a82/vtab5.test
-../TEST/TclScript/vtab6.test			z:/private/10285a82/vtab6.test
-../TEST/TclScript/vtab7.test			z:/private/10285a82/vtab7.test
-../TEST/TclScript/vtab8.test			z:/private/10285a82/vtab8.test
-../TEST/TclScript/vtab9.test			z:/private/10285a82/vtab9.test
-../TEST/TclScript/vtabA.test			z:/private/10285a82/vtaba.test
-../TEST/TclScript/vtabB.test			z:/private/10285a82/vtabb.test
-../TEST/TclScript/vtabC.test			z:/private/10285a82/vtabc.test
-../TEST/TclScript/vtab_alter.test		z:/private/10285a82/vtab_alter.test
-../TEST/TclScript/vtab_err.test			z:/private/10285a82/vtab_err.test
-../TEST/TclScript/vtab_shared.test		z:/private/10285a82/vtab_shared.test
-../TEST/TclScript/where.test			z:/private/10285a82/where.test
-../TEST/TclScript/where2.test			z:/private/10285a82/where2.test
-../TEST/TclScript/where3.test			z:/private/10285a82/where3.test
-../TEST/TclScript/where4.test			z:/private/10285a82/where4.test
-../TEST/TclScript/where5.test			z:/private/10285a82/where5.test
-../TEST/TclScript/where6.test			z:/private/10285a82/where6.test
-../TEST/TclScript/zeroblob.test			z:/private/10285a82/zeroblob.test
-../TEST/t_sqliteapi.txt				z:/private/212c3129/t_sqliteapi.txt
+../TEST/TclScript/speed1p.explain			z:/private/10285A82/speed1p.explain
+../TEST/TclScript/speed4p.explain			z:/private/10285A82/speed4p.explain
+../TEST/TclScript/fuzz_common.tcl			z:/private/10285A82/fuzz_common.tcl
+../TEST/TclScript/malloc_common.tcl			z:/private/10285A82/malloc_common.tcl
+../TEST/TclScript/tester.tcl				z:/private/10285A82/tester.tcl
+../TEST/TclScript/thread_common.tcl			z:/private/10285A82/thread_common.tcl
+../TEST/TclScript/trans2.test.gz			z:/private/10285A82/trans2.test.gz
+../TEST/TclScript/aggerror.test				z:/private/10285A82/aggerror.test
+../TEST/TclScript/alias.test				z:/private/10285A82/alias.test
+../TEST/TclScript/all.test					z:/private/10285A82/all.test
+../TEST/TclScript/alter.test				z:/private/10285A82/alter.test
+../TEST/TclScript/alter2.test				z:/private/10285A82/alter2.test
+../TEST/TclScript/alter3.test				z:/private/10285A82/alter3.test
+../TEST/TclScript/altermalloc.test			z:/private/10285A82/altermalloc.test
+../TEST/TclScript/analyze.test				z:/private/10285A82/analyze.test
+../TEST/TclScript/async.test				z:/private/10285A82/async.test
+../TEST/TclScript/async2.test				z:/private/10285A82/async2.test
+../TEST/TclScript/async3.test				z:/private/10285A82/async3.test
+../TEST/TclScript/attach.test				z:/private/10285A82/attach.test
+../TEST/TclScript/attach2.test				z:/private/10285A82/attach2.test
+../TEST/TclScript/attach3.test				z:/private/10285A82/attach3.test
+../TEST/TclScript/attachmalloc.test			z:/private/10285A82/attachmalloc.test
+../TEST/TclScript/auth.test					z:/private/10285A82/auth.test
+../TEST/TclScript/auth2.test				z:/private/10285A82/auth2.test
+../TEST/TclScript/autoinc.test				z:/private/10285A82/autoinc.test
+../TEST/TclScript/autovacuum.test			z:/private/10285A82/autovacuum.test
+../TEST/TclScript/autovacuum_ioerr2.test	z:/private/10285A82/autovacuum_ioerr2.test
+../TEST/TclScript/avtrans.test			z:/private/10285A82/avtrans.test
+../TEST/TclScript/badutf.test			z:/private/10285A82/badutf.test
+../TEST/TclScript/between.test			z:/private/10285A82/between.test
+../TEST/TclScript/bigfile.test			z:/private/10285A82/bigfile.test
+../TEST/TclScript/bigrow.test			z:/private/10285A82/bigrow.test
+../TEST/TclScript/bind.test				z:/private/10285A82/bind.test
+../TEST/TclScript/bindxfer.test			z:/private/10285A82/bindxfer.test
+../TEST/TclScript/bitvec.test			z:/private/10285A82/bitvec.test
+../TEST/TclScript/blob.test				z:/private/10285A82/blob.test
+../TEST/TclScript/busy.test				z:/private/10285A82/busy.test
+../TEST/TclScript/cache.test			z:/private/10285A82/cache.test
+../TEST/TclScript/capi2.test			z:/private/10285A82/capi2.test
+../TEST/TclScript/capi3.test			z:/private/10285A82/capi3.test
+../TEST/TclScript/capi3b.test			z:/private/10285A82/capi3b.test
+../TEST/TclScript/capi3c.test			z:/private/10285A82/capi3c.test
+../TEST/TclScript/capi3d.test			z:/private/10285A82/capi3d.test
+../TEST/TclScript/cast.test				z:/private/10285A82/cast.test
+../TEST/TclScript/check.test			z:/private/10285A82/check.test
+../TEST/TclScript/collate1.test			z:/private/10285A82/collate1.test
+../TEST/TclScript/collate2.test			z:/private/10285A82/collate2.test
+../TEST/TclScript/collate3.test			z:/private/10285A82/collate3.test
+../TEST/TclScript/collate4.test			z:/private/10285A82/collate4.test
+../TEST/TclScript/collate5.test			z:/private/10285A82/collate5.test
+../TEST/TclScript/collate6.test			z:/private/10285A82/collate6.test
+../TEST/TclScript/collate7.test			z:/private/10285A82/collate7.test
+../TEST/TclScript/collate8.test			z:/private/10285A82/collate8.test
+../TEST/TclScript/collate9.test			z:/private/10285A82/collate9.test
+../TEST/TclScript/collateA.test			z:/private/10285A82/collateA.test
+../TEST/TclScript/colmeta.test			z:/private/10285A82/colmeta.test
+../TEST/TclScript/colname.test			z:/private/10285A82/colname.test
+../TEST/TclScript/conflict.test			z:/private/10285A82/conflict.test
+../TEST/TclScript/corrupt.test			z:/private/10285A82/corrupt.test
+../TEST/TclScript/corrupt2.test			z:/private/10285A82/corrupt2.test
+../TEST/TclScript/corrupt3.test			z:/private/10285A82/corrupt3.test
+../TEST/TclScript/corrupt4.test			z:/private/10285A82/corrupt4.test
+../TEST/TclScript/corrupt5.test			z:/private/10285A82/corrupt5.test
+../TEST/TclScript/corrupt6.test			z:/private/10285A82/corrupt6.test
+../TEST/TclScript/corrupt7.test			z:/private/10285A82/corrupt7.test
+../TEST/TclScript/corrupt8.test			z:/private/10285A82/corrupt8.test
+../TEST/TclScript/corrupt9.test			z:/private/10285A82/corrupt9.test
+../TEST/TclScript/corruptA.test			z:/private/10285A82/corruptA.test
+../TEST/TclScript/crash.test			z:/private/10285A82/crash.test
+../TEST/TclScript/crash2.test			z:/private/10285A82/crash2.test
+../TEST/TclScript/crash3.test			z:/private/10285A82/crash3.test
+../TEST/TclScript/crash4.test			z:/private/10285A82/crash4.test
+../TEST/TclScript/crash5.test			z:/private/10285A82/crash5.test
+../TEST/TclScript/crash6.test			z:/private/10285A82/crash6.test
+../TEST/TclScript/crash7.test			z:/private/10285A82/crash7.test
+../TEST/TclScript/createtab.test		z:/private/10285A82/createtab.test
+../TEST/TclScript/cse.test				z:/private/10285A82/cse.test
+../TEST/TclScript/date.test				z:/private/10285A82/date.test
+../TEST/TclScript/default.test			z:/private/10285A82/default.test
+../TEST/TclScript/delete.test			z:/private/10285A82/delete.test
+../TEST/TclScript/delete2.test			z:/private/10285A82/delete2.test
+../TEST/TclScript/delete3.test			z:/private/10285A82/delete3.test
+../TEST/TclScript/descidx1.test			z:/private/10285A82/descidx1.test
+../TEST/TclScript/descidx2.test			z:/private/10285A82/descidx2.test
+../TEST/TclScript/descidx3.test			z:/private/10285A82/descidx3.test
+../TEST/TclScript/diskfull.test			z:/private/10285A82/diskfull.test
+../TEST/TclScript/distinctagg.test		z:/private/10285A82/distinctagg.test
+../TEST/TclScript/enc.test				z:/private/10285A82/enc.test
+../TEST/TclScript/enc2.test				z:/private/10285A82/enc2.test
+../TEST/TclScript/enc3.test				z:/private/10285A82/enc3.test
+../TEST/TclScript/eval.test				z:/private/10285A82/eval.test
+../TEST/TclScript/exclusive.test		z:/private/10285A82/exclusive.test
+../TEST/TclScript/exclusive2.test		z:/private/10285A82/exclusive2.test
+../TEST/TclScript/exec.test				z:/private/10285A82/exec.test
+../TEST/TclScript/expr.test				z:/private/10285A82/expr.test
+../TEST/TclScript/filectrl.test			z:/private/10285A82/filectrl.test
+../TEST/TclScript/filefmt.test			z:/private/10285A82/filefmt.test
+../TEST/TclScript/fkey1.test			z:/private/10285A82/fkey1.test
+../TEST/TclScript/format4.test			z:/private/10285A82/format4.test
+../TEST/TclScript/fts1a.test			z:/private/10285A82/fts1a.test
+../TEST/TclScript/fts1b.test			z:/private/10285A82/fts1b.test
+../TEST/TclScript/fts1c.test			z:/private/10285A82/fts1c.test
+../TEST/TclScript/fts1d.test			z:/private/10285A82/fts1d.test
+../TEST/TclScript/fts1e.test			z:/private/10285A82/fts1e.test
+../TEST/TclScript/fts1f.test			z:/private/10285A82/fts1f.test
+../TEST/TclScript/fts1i.test			z:/private/10285A82/fts1i.test
+../TEST/TclScript/fts1j.test			z:/private/10285A82/fts1j.test
+../TEST/TclScript/fts1k.test			z:/private/10285A82/fts1k.test
+../TEST/TclScript/fts1l.test			z:/private/10285A82/fts1l.test
+../TEST/TclScript/fts1m.test			z:/private/10285A82/fts1m.test
+../TEST/TclScript/fts1n.test			z:/private/10285A82/fts1n.test
+../TEST/TclScript/fts1o.test			z:/private/10285A82/fts1o.test
+../TEST/TclScript/fts1porter.test		z:/private/10285A82/fts1porter.test
+../TEST/TclScript/fts2.test				z:/private/10285A82/fts2.test
+../TEST/TclScript/fts2a.test			z:/private/10285A82/fts2a.test
+../TEST/TclScript/fts2b.test			z:/private/10285A82/fts2b.test
+../TEST/TclScript/fts2c.test			z:/private/10285A82/fts2c.test
+../TEST/TclScript/fts2d.test			z:/private/10285A82/fts2d.test
+../TEST/TclScript/fts2e.test			z:/private/10285A82/fts2e.test
+../TEST/TclScript/fts2f.test			z:/private/10285A82/fts2f.test
+../TEST/TclScript/fts2g.test			z:/private/10285A82/fts2g.test
+../TEST/TclScript/fts2h.test			z:/private/10285A82/fts2h.test
+../TEST/TclScript/fts2i.test			z:/private/10285A82/fts2i.test
+../TEST/TclScript/fts2j.test			z:/private/10285A82/fts2j.test
+../TEST/TclScript/fts2k.test			z:/private/10285A82/fts2k.test
+../TEST/TclScript/fts2l.test			z:/private/10285A82/fts2l.test
+../TEST/TclScript/fts2m.test			z:/private/10285A82/fts2m.test
+../TEST/TclScript/fts2n.test			z:/private/10285A82/fts2n.test
+../TEST/TclScript/fts2o.test			z:/private/10285A82/fts2o.test
+../TEST/TclScript/fts2p.test			z:/private/10285A82/fts2p.test
+../TEST/TclScript/fts2q.test			z:/private/10285A82/fts2q.test
+../TEST/TclScript/fts2r.test			z:/private/10285A82/fts2r.test
+../TEST/TclScript/fts2token.test		z:/private/10285A82/fts2token.test
+../TEST/TclScript/fts3.test				z:/private/10285A82/fts3.test
+../TEST/TclScript/fts3aa.test			z:/private/10285A82/fts3aa.test
+../TEST/TclScript/fts3ab.test			z:/private/10285A82/fts3ab.test
+../TEST/TclScript/fts3ac.test			z:/private/10285A82/fts3ac.test
+../TEST/TclScript/fts3ad.test			z:/private/10285A82/fts3ad.test
+../TEST/TclScript/fts3ae.test			z:/private/10285A82/fts3ae.test
+../TEST/TclScript/fts3af.test			z:/private/10285A82/fts3af.test
+../TEST/TclScript/fts3ag.test			z:/private/10285A82/fts3ag.test
+../TEST/TclScript/fts3ah.test			z:/private/10285A82/fts3ah.test
+../TEST/TclScript/fts3ai.test			z:/private/10285A82/fts3ai.test
+../TEST/TclScript/fts3aj.test			z:/private/10285A82/fts3aj.test
+../TEST/TclScript/fts3ak.test			z:/private/10285A82/fts3ak.test
+../TEST/TclScript/fts3al.test			z:/private/10285A82/fts3al.test
+../TEST/TclScript/fts3am.test			z:/private/10285A82/fts3am.test
+../TEST/TclScript/fts3an.test			z:/private/10285A82/fts3an.test
+../TEST/TclScript/fts3ao.test			z:/private/10285A82/fts3ao.test
+../TEST/TclScript/fts3atoken.test		z:/private/10285A82/fts3atoken.test
+../TEST/TclScript/fts3b.test			z:/private/10285A82/fts3b.test
+../TEST/TclScript/fts3c.test			z:/private/10285A82/fts3c.test
+../TEST/TclScript/fts3d.test			z:/private/10285A82/fts3d.test
+../TEST/TclScript/fts3e.test			z:/private/10285A82/fts3e.test
+../TEST/TclScript/fts3near.test			z:/private/10285A82/fts3near.test
+../TEST/TclScript/func.test				z:/private/10285A82/func.test
+../TEST/TclScript/fuzz.test				z:/private/10285A82/fuzz.test
+../TEST/TclScript/fuzz2.test			z:/private/10285A82/fuzz2.test
+../TEST/TclScript/fuzz_malloc.test		z:/private/10285A82/fuzz_malloc.test
+../TEST/TclScript/hook.test				z:/private/10285A82/hook.test
+../TEST/TclScript/icu.test				z:/private/10285A82/icu.test
+../TEST/TclScript/in.test				z:/private/10285A82/in.test
+../TEST/TclScript/in2.test				z:/private/10285A82/in2.test
+../TEST/TclScript/in3.test				z:/private/10285A82/in3.test
+../TEST/TclScript/incrblob.test			z:/private/10285A82/incrblob.test
+../TEST/TclScript/incrblob2.test		z:/private/10285A82/incrblob2.test
+../TEST/TclScript/incrblob_err.test		z:/private/10285A82/incrblob_err.test
+../TEST/TclScript/incrvacuum.test		z:/private/10285A82/incrvacuum.test
+../TEST/TclScript/incrvacuum2.test		z:/private/10285A82/incrvacuum2.test
+../TEST/TclScript/incrvacuum_ioerr.test	z:/private/10285A82/incrvacuum_ioerr.test
+../TEST/TclScript/index.test			z:/private/10285A82/index.test
+../TEST/TclScript/index2.test			z:/private/10285A82/index2.test
+../TEST/TclScript/index3.test			z:/private/10285A82/index3.test
+../TEST/TclScript/insert.test			z:/private/10285A82/insert.test
+../TEST/TclScript/insert2.test			z:/private/10285A82/insert2.test
+../TEST/TclScript/insert3.test			z:/private/10285A82/insert3.test
+../TEST/TclScript/insert4.test			z:/private/10285A82/insert4.test
+../TEST/TclScript/insert5.test			z:/private/10285A82/insert5.test
+../TEST/TclScript/interrupt.test		z:/private/10285A82/interrupt.test
+../TEST/TclScript/intpkey.test			z:/private/10285A82/intpkey.test
+../TEST/TclScript/io.test				z:/private/10285A82/io.test
+../TEST/TclScript/ioerr.test			z:/private/10285A82/ioerr.test
+../TEST/TclScript/ioerr2.test			z:/private/10285A82/ioerr2.test
+../TEST/TclScript/ioerr3.test			z:/private/10285A82/ioerr3.test
+../TEST/TclScript/ioerr4.test			z:/private/10285A82/ioerr4.test
+../TEST/TclScript/ioerr5.test			z:/private/10285A82/ioerr5.test
+../TEST/TclScript/join.test				z:/private/10285A82/join.test
+../TEST/TclScript/join2.test			z:/private/10285A82/join2.test
+../TEST/TclScript/join3.test			z:/private/10285A82/join3.test
+../TEST/TclScript/join4.test			z:/private/10285A82/join4.test
+../TEST/TclScript/join5.test			z:/private/10285A82/join5.test
+../TEST/TclScript/journal1.test			z:/private/10285A82/journal1.test
+../TEST/TclScript/jrnlmode.test			z:/private/10285A82/jrnlmode.test
+../TEST/TclScript/lastinsert.test		z:/private/10285A82/lastinsert.test
+../TEST/TclScript/laststmtchanges.test	z:/private/10285A82/laststmtchanges.test
+../TEST/TclScript/like.test				z:/private/10285A82/like.test
+../TEST/TclScript/like2.test			z:/private/10285A82/like2.test
+../TEST/TclScript/limit.test			z:/private/10285A82/limit.test
+../TEST/TclScript/loadext.test			z:/private/10285A82/loadext.test
+../TEST/TclScript/loadext2.test			z:/private/10285A82/loadext2.test
+../TEST/TclScript/lock.test				z:/private/10285A82/lock.test
+../TEST/TclScript/lock2.test			z:/private/10285A82/lock2.test
+../TEST/TclScript/lock3.test			z:/private/10285A82/lock3.test
+../TEST/TclScript/lock4.test			z:/private/10285A82/lock4.test
+../TEST/TclScript/lock5.test			z:/private/10285A82/lock5.test
+../TEST/TclScript/lookaside.test		z:/private/10285A82/lookaside.test
+../TEST/TclScript/main.test				z:/private/10285A82/main.test
+../TEST/TclScript/malloc.test			z:/private/10285A82/malloc.test
+../TEST/TclScript/malloc3.test			z:/private/10285A82/malloc3.test
+../TEST/TclScript/malloc4.test			z:/private/10285A82/malloc4.test
+../TEST/TclScript/malloc5.test			z:/private/10285A82/malloc5.test
+../TEST/TclScript/malloc6.test			z:/private/10285A82/malloc6.test
+../TEST/TclScript/malloc7.test			z:/private/10285A82/malloc7.test
+../TEST/TclScript/malloc8.test			z:/private/10285A82/malloc8.test
+../TEST/TclScript/malloc9.test			z:/private/10285A82/malloc9.test
+../TEST/TclScript/mallocA.test			z:/private/10285A82/mallocA.test
+../TEST/TclScript/mallocAll.test		z:/private/10285A82/mallocAll.test
+../TEST/TclScript/mallocB.test			z:/private/10285A82/mallocB.test
+../TEST/TclScript/mallocC.test			z:/private/10285A82/mallocC.test
+../TEST/TclScript/mallocD.test			z:/private/10285A82/mallocD.test
+../TEST/TclScript/mallocE.test			z:/private/10285A82/mallocE.test
+../TEST/TclScript/mallocF.test			z:/private/10285A82/mallocF.test
+../TEST/TclScript/mallocG.test			z:/private/10285A82/mallocG.test
+../TEST/TclScript/mallocH.test			z:/private/10285A82/mallocH.test
+../TEST/TclScript/mallocI.test			z:/private/10285A82/mallocI.test
+../TEST/TclScript/manydb.test			z:/private/10285A82/manydb.test
+../TEST/TclScript/memdb.test			z:/private/10285A82/memdb.test
+../TEST/TclScript/memleak.test			z:/private/10285A82/memleak.test
+../TEST/TclScript/memsubsys1.test		z:/private/10285A82/memsubsys1.test
+../TEST/TclScript/memsubsys2.test		z:/private/10285A82/memsubsys2.test
+../TEST/TclScript/minmax.test			z:/private/10285A82/minmax.test
+../TEST/TclScript/minmax2.test			z:/private/10285A82/minmax2.test
+../TEST/TclScript/minmax3.test			z:/private/10285A82/minmax3.test
+../TEST/TclScript/misc1.test			z:/private/10285A82/misc1.test
+../TEST/TclScript/misc2.test			z:/private/10285A82/misc2.test
+../TEST/TclScript/misc3.test			z:/private/10285A82/misc3.test
+../TEST/TclScript/misc4.test			z:/private/10285A82/misc4.test
+../TEST/TclScript/misc5.test			z:/private/10285A82/misc5.test
+../TEST/TclScript/misc6.test			z:/private/10285A82/misc6.test
+../TEST/TclScript/misc7.test			z:/private/10285A82/misc7.test
+../TEST/TclScript/misuse.test			z:/private/10285A82/misuse.test
+../TEST/TclScript/mutex1.test			z:/private/10285A82/mutex1.test
+../TEST/TclScript/mutex2.test			z:/private/10285A82/mutex2.test
+../TEST/TclScript/nan.test				z:/private/10285A82/nan.test
+../TEST/TclScript/notnull.test			z:/private/10285A82/notnull.test
+../TEST/TclScript/null.test				z:/private/10285A82/null.test
+../TEST/TclScript/openv2.test			z:/private/10285A82/openv2.test
+../TEST/TclScript/pager.test			z:/private/10285A82/pager.test
+../TEST/TclScript/pager2.test			z:/private/10285A82/pager2.test
+../TEST/TclScript/pager3.test			z:/private/10285A82/pager3.test
+../TEST/TclScript/pageropt.test			z:/private/10285A82/pageropt.test
+../TEST/TclScript/pagesize.test			z:/private/10285A82/pagesize.test
+../TEST/TclScript/pcache.test			z:/private/10285A82/pcache.test
+../TEST/TclScript/permutations.test		z:/private/10285A82/permutations.test
+../TEST/TclScript/pragma.test			z:/private/10285A82/pragma.test
+../TEST/TclScript/pragma2.test			z:/private/10285A82/pragma2.test
+../TEST/TclScript/printf.test			z:/private/10285A82/printf.test
+../TEST/TclScript/progress.test			z:/private/10285A82/progress.test
+../TEST/TclScript/ptrchng.test			z:/private/10285A82/ptrchng.test
+../TEST/TclScript/quick.test			z:/private/10285A82/quick.test
+../TEST/TclScript/quote.test			z:/private/10285A82/quote.test
+../TEST/TclScript/rdonly.test			z:/private/10285A82/rdonly.test
+../TEST/TclScript/reindex.test			z:/private/10285A82/reindex.test
+../TEST/TclScript/rollback.test			z:/private/10285A82/rollback.test
+../TEST/TclScript/rowid.test			z:/private/10285A82/rowid.test
+../TEST/TclScript/rtree.test			z:/private/10285A82/rtree.test
+../TEST/TclScript/safety.test			z:/private/10285A82/safety.test
+../TEST/TclScript/schema.test			z:/private/10285A82/schema.test
+../TEST/TclScript/schema2.test			z:/private/10285A82/schema2.test
+../TEST/TclScript/select1.test			z:/private/10285A82/select1.test
+../TEST/TclScript/select2.test			z:/private/10285A82/select2.test
+../TEST/TclScript/select3.test			z:/private/10285A82/select3.test
+../TEST/TclScript/select4.test			z:/private/10285A82/select4.test
+../TEST/TclScript/select5.test			z:/private/10285A82/select5.test
+../TEST/TclScript/select6.test			z:/private/10285A82/select6.test
+../TEST/TclScript/select7.test			z:/private/10285A82/select7.test
+../TEST/TclScript/select8.test			z:/private/10285A82/select8.test
+../TEST/TclScript/select9.test			z:/private/10285A82/select9.test
+../TEST/TclScript/selectA.test			z:/private/10285A82/selectA.test
+../TEST/TclScript/selectB.test			z:/private/10285A82/selectB.test
+../TEST/TclScript/server1.test			z:/private/10285A82/server1.test
+../TEST/TclScript/shared.test			z:/private/10285A82/shared.test
+../TEST/TclScript/shared2.test			z:/private/10285A82/shared2.test
+../TEST/TclScript/shared3.test			z:/private/10285A82/shared3.test
+../TEST/TclScript/shared4.test			z:/private/10285A82/shared4.test
+../TEST/TclScript/shared_err.test		z:/private/10285A82/shared_err.test
+../TEST/TclScript/shortread1.test		z:/private/10285A82/shortread1.test
+../TEST/TclScript/sidedelete.test		z:/private/10285A82/sidedelete.test
+../TEST/TclScript/soak.test				z:/private/10285A82/soak.test
+../TEST/TclScript/softheap1.test		z:/private/10285A82/softheap1.test
+../TEST/TclScript/sort.test				z:/private/10285A82/sort.test
+../TEST/TclScript/speed1.test			z:/private/10285A82/speed1.test
+../TEST/TclScript/speed1p.test			z:/private/10285A82/speed1p.test
+../TEST/TclScript/speed2.test			z:/private/10285A82/speed2.test
+../TEST/TclScript/speed3.test			z:/private/10285A82/speed3.test
+../TEST/TclScript/speed4.test			z:/private/10285A82/speed4.test
+../TEST/TclScript/speed4p.test			z:/private/10285A82/speed4p.test
+../TEST/TclScript/sqllimits1.test		z:/private/10285A82/sqllimits1.test
+../TEST/TclScript/subquery.test			z:/private/10285A82/subquery.test
+../TEST/TclScript/subselect.test		z:/private/10285A82/subselect.test
+../TEST/TclScript/substr.test			z:/private/10285A82/substr.test
+../TEST/TclScript/sync.test				z:/private/10285A82/sync.test
+../TEST/TclScript/table.test			z:/private/10285A82/table.test
+../TEST/TclScript/tableapi.test			z:/private/10285A82/tableapi.test
+../TEST/TclScript/tclsqlite.test		z:/private/10285A82/tclsqlite.test
+../TEST/TclScript/tempdb.test			z:/private/10285A82/tempdb.test
+../TEST/TclScript/temptable.test		z:/private/10285A82/temptable.test
+../TEST/TclScript/thread001.test		z:/private/10285A82/thread001.test
+../TEST/TclScript/thread002.test		z:/private/10285A82/thread002.test
+../TEST/TclScript/thread003.test		z:/private/10285A82/thread003.test
+../TEST/TclScript/thread1.test			z:/private/10285A82/thread1.test
+../TEST/TclScript/thread2.test			z:/private/10285A82/thread2.test
+../TEST/TclScript/tkt1435.test			z:/private/10285A82/tkt1435.test
+../TEST/TclScript/tkt1443.test			z:/private/10285A82/tkt1443.test
+../TEST/TclScript/tkt1444.test			z:/private/10285A82/tkt1444.test
+../TEST/TclScript/tkt1449.test			z:/private/10285A82/tkt1449.test
+../TEST/TclScript/tkt1473.test			z:/private/10285A82/tkt1473.test
+../TEST/TclScript/tkt1501.test			z:/private/10285A82/tkt1501.test
+../TEST/TclScript/tkt1512.test			z:/private/10285A82/tkt1512.test
+../TEST/TclScript/tkt1514.test			z:/private/10285A82/tkt1514.test
+../TEST/TclScript/tkt1536.test			z:/private/10285A82/tkt1536.test
+../TEST/TclScript/tkt1537.test			z:/private/10285A82/tkt1537.test
+../TEST/TclScript/tkt1567.test			z:/private/10285A82/tkt1567.test
+../TEST/TclScript/tkt1644.test			z:/private/10285A82/tkt1644.test
+../TEST/TclScript/tkt1667.test			z:/private/10285A82/tkt1667.test
+../TEST/TclScript/tkt1873.test			z:/private/10285A82/tkt1873.test
+../TEST/TclScript/tkt2141.test			z:/private/10285A82/tkt2141.test
+../TEST/TclScript/tkt2192.test			z:/private/10285A82/tkt2192.test
+../TEST/TclScript/tkt2213.test			z:/private/10285A82/tkt2213.test
+../TEST/TclScript/tkt2251.test			z:/private/10285A82/tkt2251.test
+../TEST/TclScript/tkt2285.test			z:/private/10285A82/tkt2285.test
+../TEST/TclScript/tkt2332.test			z:/private/10285A82/tkt2332.test
+../TEST/TclScript/tkt2339.test			z:/private/10285A82/tkt2339.test
+../TEST/TclScript/tkt2391.test			z:/private/10285A82/tkt2391.test
+../TEST/TclScript/tkt2409.test			z:/private/10285A82/tkt2409.test
+../TEST/TclScript/tkt2450.test			z:/private/10285A82/tkt2450.test
+../TEST/TclScript/tkt2640.test			z:/private/10285A82/tkt2640.test
+../TEST/TclScript/tkt2643.test			z:/private/10285A82/tkt2643.test
+../TEST/TclScript/tkt2686.test			z:/private/10285A82/tkt2686.test
+../TEST/TclScript/tkt2767.test			z:/private/10285A82/tkt2767.test
+../TEST/TclScript/tkt2817.test			z:/private/10285A82/tkt2817.test
+../TEST/TclScript/tkt2820.test			z:/private/10285A82/tkt2820.test
+../TEST/TclScript/tkt2822.test			z:/private/10285A82/tkt2822.test
+../TEST/TclScript/tkt2832.test			z:/private/10285A82/tkt2832.test
+../TEST/TclScript/tkt2854.test			z:/private/10285A82/tkt2854.test
+../TEST/TclScript/tkt2920.test			z:/private/10285A82/tkt2920.test
+../TEST/TclScript/tkt2927.test			z:/private/10285A82/tkt2927.test
+../TEST/TclScript/tkt2942.test			z:/private/10285A82/tkt2942.test
+../TEST/TclScript/tkt3080.test			z:/private/10285A82/tkt3080.test
+../TEST/TclScript/tkt3093.test			z:/private/10285A82/tkt3093.test
+../TEST/TclScript/tkt3121.test			z:/private/10285A82/tkt3121.test
+../TEST/TclScript/tkt3201.test			z:/private/10285A82/tkt3201.test
+../TEST/TclScript/tkt3292.test			z:/private/10285A82/tkt3292.test
+../TEST/TclScript/tkt3298.test			z:/private/10285A82/tkt3298.test
+../TEST/TclScript/tkt3334.test			z:/private/10285A82/tkt3334.test
+../TEST/TclScript/tokenize.test			z:/private/10285A82/tokenize.test
+../TEST/TclScript/trace.test			z:/private/10285A82/trace.test
+../TEST/TclScript/trans.test			z:/private/10285A82/trans.test
+../TEST/TclScript/trans2.test			z:/private/10285A82/trans2.test
+../TEST/TclScript/trigger1.test			z:/private/10285A82/trigger1.test
+../TEST/TclScript/trigger2.test			z:/private/10285A82/trigger2.test
+../TEST/TclScript/trigger3.test			z:/private/10285A82/trigger3.test
+../TEST/TclScript/trigger4.test			z:/private/10285A82/trigger4.test
+../TEST/TclScript/trigger5.test			z:/private/10285A82/trigger5.test
+../TEST/TclScript/trigger6.test			z:/private/10285A82/trigger6.test
+../TEST/TclScript/trigger7.test			z:/private/10285A82/trigger7.test
+../TEST/TclScript/trigger8.test			z:/private/10285A82/trigger8.test
+../TEST/TclScript/trigger9.test			z:/private/10285A82/trigger9.test
+../TEST/TclScript/triggerA.test			z:/private/10285A82/triggerA.test
+../TEST/TclScript/triggerB.test			z:/private/10285A82/triggerB.test
+../TEST/TclScript/types.test			z:/private/10285A82/types.test
+../TEST/TclScript/types2.test			z:/private/10285A82/types2.test
+../TEST/TclScript/types3.test			z:/private/10285A82/types3.test
+../TEST/TclScript/unique.test			z:/private/10285A82/unique.test
+../TEST/TclScript/update.test			z:/private/10285A82/update.test
+../TEST/TclScript/utf16align.test		z:/private/10285A82/utf16align.test
+../TEST/TclScript/vacuum.test			z:/private/10285A82/vacuum.test
+../TEST/TclScript/vacuum2.test			z:/private/10285A82/vacuum2.test
+../TEST/TclScript/vacuum3.test			z:/private/10285A82/vacuum3.test
+../TEST/TclScript/varint.test			z:/private/10285A82/varint.test
+../TEST/TclScript/veryquick.test		z:/private/10285A82/veryquick.test
+../TEST/TclScript/view.test				z:/private/10285A82/view.test
+../TEST/TclScript/vtab1.test			z:/private/10285A82/vtab1.test
+../TEST/TclScript/vtab2.test			z:/private/10285A82/vtab2.test
+../TEST/TclScript/vtab3.test			z:/private/10285A82/vtab3.test
+../TEST/TclScript/vtab4.test			z:/private/10285A82/vtab4.test
+../TEST/TclScript/vtab5.test			z:/private/10285A82/vtab5.test
+../TEST/TclScript/vtab6.test			z:/private/10285A82/vtab6.test
+../TEST/TclScript/vtab7.test			z:/private/10285A82/vtab7.test
+../TEST/TclScript/vtab8.test			z:/private/10285A82/vtab8.test
+../TEST/TclScript/vtab9.test			z:/private/10285A82/vtab9.test
+../TEST/TclScript/vtabA.test			z:/private/10285A82/vtabA.test
+../TEST/TclScript/vtabB.test			z:/private/10285A82/vtabB.test
+../TEST/TclScript/vtabC.test			z:/private/10285A82/vtabC.test
+../TEST/TclScript/vtab_alter.test		z:/private/10285A82/vtab_alter.test
+../TEST/TclScript/vtab_err.test			z:/private/10285A82/vtab_err.test
+../TEST/TclScript/vtab_shared.test		z:/private/10285A82/vtab_shared.test
+../TEST/TclScript/where.test			z:/private/10285A82/where.test
+../TEST/TclScript/where2.test			z:/private/10285A82/where2.test
+../TEST/TclScript/where3.test			z:/private/10285A82/where3.test
+../TEST/TclScript/where4.test			z:/private/10285A82/where4.test
+../TEST/TclScript/where5.test			z:/private/10285A82/where5.test
+../TEST/TclScript/where6.test			z:/private/10285A82/where6.test
+../TEST/TclScript/zeroblob.test			z:/private/10285A82/zeroblob.test
 
 PRJ_TESTMMPFILES
 
--- a/persistentstorage/sqlite3api/GROUP/sqlite3tests.bat	Wed Sep 15 14:05:58 2010 +0300
+++ b/persistentstorage/sqlite3api/GROUP/sqlite3tests.bat	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 @rem
-@rem Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 @rem All rights reserved.
 @rem This component and the accompanying materials are made available
 @rem under the terms of "Eclipse Public License v1.0"
@@ -14,8 +14,8 @@
 @rem Description:
 @rem
 
-t_sqliteapi.exe
-t_sqlitewsd.exe
-t_sqliteperf.exe
-t_sqliteperf2.exe
-t_sqlitedef.exe
+T_SQLITEAPI.EXE
+T_SQLITEWSD.EXE
+T_SQLITEPERF.EXE
+T_SQLITEPERF2.EXE
+T_SQLITEDEF.EXE
--- a/persistentstorage/sqlite3api/GROUP/sqlite3tests.iby	Wed Sep 15 14:05:58 2010 +0300
+++ b/persistentstorage/sqlite3api/GROUP/sqlite3tests.iby	Wed Oct 13 16:30:44 2010 +0300
@@ -24,7 +24,7 @@
 
 #ifndef __STDIOSERVER_EXE__
 #define __STDIOSERVER_EXE__
-file=ABI_DIR\BUILD_DIR\stdioserver.exe			sys\bin\stdioserver.exe
+file=ABI_DIR\BUILD_DIR\StdioServer.exe			sys\bin\StdioServer.exe
 #endif
 
 #ifndef __TCLSQLITE3_CONFIG_INI__
@@ -32,417 +32,416 @@
 data=DATAZ_\test\config.ini                 system\data\config.ini
 #endif
 
-data=DATAZ_\test\sqlite3tests.bat			\test\sqlite3tests.bat
+data=DATAZ_\test\sqlite3Tests.bat			\TEST\sqlite3Tests.bat
 
-data=ZPRIVATE\10285a82\speed1p.explain		\private\10285a82\speed1p.explain
-data=ZPRIVATE\10285a82\speed4p.explain		\private\10285a82\speed4p.explain
+data=ZPRIVATE\10285A82\speed1p.explain		\PRIVATE\10285A82\speed1p.explain
+data=ZPRIVATE\10285A82\speed4p.explain		\PRIVATE\10285A82\speed4p.explain
 
-data=ZPRIVATE\10285a82\fuzz_common.tcl		\private\10285a82\fuzz_common.tcl
-data=ZPRIVATE\10285a82\malloc_common.tcl	\private\10285a82\malloc_common.tcl
-data=ZPRIVATE\10285a82\tester.tcl			\private\10285a82\tester.tcl
-data=ZPRIVATE\10285a82\thread_common.tcl	\private\10285a82\thread_common.tcl
+data=ZPRIVATE\10285A82\fuzz_common.tcl		\PRIVATE\10285A82\fuzz_common.tcl
+data=ZPRIVATE\10285A82\malloc_common.tcl	\PRIVATE\10285A82\malloc_common.tcl
+data=ZPRIVATE\10285A82\tester.tcl			\PRIVATE\10285A82\tester.tcl
+data=ZPRIVATE\10285A82\thread_common.tcl	\PRIVATE\10285A82\thread_common.tcl
 
-data=ZPRIVATE\10285a82\aggerror.test			\private\10285a82\aggerror.test
-data=ZPRIVATE\10285a82\all.test				\private\10285a82\all.test
-data=ZPRIVATE\10285a82\alter.test			\private\10285a82\alter.test
-data=ZPRIVATE\10285a82\alter2.test			\private\10285a82\alter2.test
-data=ZPRIVATE\10285a82\alter3.test			\private\10285a82\alter3.test
-data=ZPRIVATE\10285a82\altermalloc.test			\private\10285a82\altermalloc.test
-data=ZPRIVATE\10285a82\analyze.test			\private\10285a82\analyze.test
-data=ZPRIVATE\10285a82\async.test			\private\10285a82\async.test
-data=ZPRIVATE\10285a82\async2.test			\private\10285a82\async2.test
-data=ZPRIVATE\10285a82\async3.test			\private\10285a82\async3.test
-data=ZPRIVATE\10285a82\attach.test			\private\10285a82\attach.test
-data=ZPRIVATE\10285a82\attach2.test			\private\10285a82\attach2.test
-data=ZPRIVATE\10285a82\attach3.test			\private\10285a82\attach3.test
-data=ZPRIVATE\10285a82\attachmalloc.test		\private\10285a82\attachmalloc.test
-data=ZPRIVATE\10285a82\auth.test			\private\10285a82\auth.test
-data=ZPRIVATE\10285a82\auth2.test			\private\10285a82\auth2.test
-data=ZPRIVATE\10285a82\autoinc.test			\private\10285a82\autoinc.test
-data=ZPRIVATE\10285a82\autovacuum.test			\private\10285a82\autovacuum.test
-data=ZPRIVATE\10285a82\autovacuum_ioerr2.test		\private\10285a82\autovacuum_ioerr2.test
-data=ZPRIVATE\10285a82\avtrans.test			\private\10285a82\avtrans.test
-data=ZPRIVATE\10285a82\badutf.test			\private\10285a82\badutf.test
-data=ZPRIVATE\10285a82\between.test			\private\10285a82\between.test
-data=ZPRIVATE\10285a82\bigfile.test			\private\10285a82\bigfile.test
-data=ZPRIVATE\10285a82\bigrow.test			\private\10285a82\bigrow.test
-data=ZPRIVATE\10285a82\bind.test			\private\10285a82\bind.test
-data=ZPRIVATE\10285a82\bindxfer.test			\private\10285a82\bindxfer.test
-data=ZPRIVATE\10285a82\bitvec.test			\private\10285a82\bitvec.test
-data=ZPRIVATE\10285a82\blob.test			\private\10285a82\blob.test
-data=ZPRIVATE\10285a82\busy.test			\private\10285a82\busy.test
-data=ZPRIVATE\10285a82\cache.test			\private\10285a82\cache.test
-data=ZPRIVATE\10285a82\capi2.test			\private\10285a82\capi2.test
-data=ZPRIVATE\10285a82\capi3.test			\private\10285a82\capi3.test
-data=ZPRIVATE\10285a82\capi3b.test			\private\10285a82\capi3b.test
-data=ZPRIVATE\10285a82\capi3c.test			\private\10285a82\capi3c.test
-data=ZPRIVATE\10285a82\capi3d.test			\private\10285a82\capi3d.test
-data=ZPRIVATE\10285a82\cast.test			\private\10285a82\cast.test
-data=ZPRIVATE\10285a82\check.test			\private\10285a82\check.test
-data=ZPRIVATE\10285a82\collate1.test			\private\10285a82\collate1.test
-data=ZPRIVATE\10285a82\collate2.test			\private\10285a82\collate2.test
-data=ZPRIVATE\10285a82\collate3.test			\private\10285a82\collate3.test
-data=ZPRIVATE\10285a82\collate4.test			\private\10285a82\collate4.test
-data=ZPRIVATE\10285a82\collate5.test			\private\10285a82\collate5.test
-data=ZPRIVATE\10285a82\collate6.test			\private\10285a82\collate6.test
-data=ZPRIVATE\10285a82\collate7.test			\private\10285a82\collate7.test
-data=ZPRIVATE\10285a82\collate8.test			\private\10285a82\collate8.test
-data=ZPRIVATE\10285a82\collate9.test			\private\10285a82\collate9.test
-data=ZPRIVATE\10285a82\collatea.test			\private\10285a82\collatea.test
-data=ZPRIVATE\10285a82\colmeta.test			\private\10285a82\colmeta.test
-data=ZPRIVATE\10285a82\colname.test			\private\10285a82\colname.test
-data=ZPRIVATE\10285a82\conflict.test			\private\10285a82\conflict.test
-data=ZPRIVATE\10285a82\corrupt.test			\private\10285a82\corrupt.test
-data=ZPRIVATE\10285a82\corrupt2.test			\private\10285a82\corrupt2.test
-data=ZPRIVATE\10285a82\corrupt3.test			\private\10285a82\corrupt3.test
-data=ZPRIVATE\10285a82\corrupt4.test			\private\10285a82\corrupt4.test
-data=ZPRIVATE\10285a82\corrupt5.test			\private\10285a82\corrupt5.test
-data=ZPRIVATE\10285a82\corrupt6.test			\private\10285a82\corrupt6.test
-data=ZPRIVATE\10285a82\corrupt7.test			\private\10285a82\corrupt7.test
-data=ZPRIVATE\10285a82\corrupt8.test			\private\10285a82\corrupt8.test
-data=ZPRIVATE\10285a82\corrupt9.test			\private\10285a82\corrupt9.test
-data=ZPRIVATE\10285a82\corrupta.test			\private\10285a82\corrupta.test
-data=ZPRIVATE\10285a82\crash.test			\private\10285a82\crash.test
-data=ZPRIVATE\10285a82\crash2.test			\private\10285a82\crash2.test
-data=ZPRIVATE\10285a82\crash3.test			\private\10285a82\crash3.test
-data=ZPRIVATE\10285a82\crash4.test			\private\10285a82\crash4.test
-data=ZPRIVATE\10285a82\crash5.test			\private\10285a82\crash5.test
-data=ZPRIVATE\10285a82\crash6.test			\private\10285a82\crash6.test
-data=ZPRIVATE\10285a82\crash7.test			\private\10285a82\crash7.test
-data=ZPRIVATE\10285a82\createtab.test		\private\10285a82\createtab.test
-data=ZPRIVATE\10285a82\cse.test				\private\10285a82\cse.test
-data=ZPRIVATE\10285a82\date.test			\private\10285a82\date.test
-data=ZPRIVATE\10285a82\default.test			\private\10285a82\default.test
-data=ZPRIVATE\10285a82\delete.test			\private\10285a82\delete.test
-data=ZPRIVATE\10285a82\delete2.test			\private\10285a82\delete2.test
-data=ZPRIVATE\10285a82\delete3.test			\private\10285a82\delete3.test
-data=ZPRIVATE\10285a82\descidx1.test			\private\10285a82\descidx1.test
-data=ZPRIVATE\10285a82\descidx2.test			\private\10285a82\descidx2.test
-data=ZPRIVATE\10285a82\descidx3.test			\private\10285a82\descidx3.test
-data=ZPRIVATE\10285a82\diskfull.test			\private\10285a82\diskfull.test
-data=ZPRIVATE\10285a82\distinctagg.test			\private\10285a82\distinctagg.test
-data=ZPRIVATE\10285a82\enc.test				\private\10285a82\enc.test
-data=ZPRIVATE\10285a82\enc2.test			\private\10285a82\enc2.test
-data=ZPRIVATE\10285a82\enc3.test			\private\10285a82\enc3.test
-data=ZPRIVATE\10285a82\eval.test			\private\10285a82\eval.test
-data=ZPRIVATE\10285a82\exclusive.test			\private\10285a82\exclusive.test
-data=ZPRIVATE\10285a82\exclusive2.test			\private\10285a82\exclusive2.test
-data=ZPRIVATE\10285a82\exec.test			\private\10285a82\exec.test
-data=ZPRIVATE\10285a82\expr.test			\private\10285a82\expr.test
-data=ZPRIVATE\10285a82\filectrl.test		\private\10285a82\filectrl.test
-data=ZPRIVATE\10285a82\filefmt.test			\private\10285a82\filefmt.test
-data=ZPRIVATE\10285a82\fkey1.test			\private\10285a82\fkey1.test
-data=ZPRIVATE\10285a82\format4.test			\private\10285a82\format4.test
-data=ZPRIVATE\10285a82\fts1a.test			\private\10285a82\fts1a.test
-data=ZPRIVATE\10285a82\fts1b.test			\private\10285a82\fts1b.test
-data=ZPRIVATE\10285a82\fts1c.test			\private\10285a82\fts1c.test
-data=ZPRIVATE\10285a82\fts1d.test			\private\10285a82\fts1d.test
-data=ZPRIVATE\10285a82\fts1e.test			\private\10285a82\fts1e.test
-data=ZPRIVATE\10285a82\fts1f.test			\private\10285a82\fts1f.test
-data=ZPRIVATE\10285a82\fts1i.test			\private\10285a82\fts1i.test
-data=ZPRIVATE\10285a82\fts1j.test			\private\10285a82\fts1j.test
-data=ZPRIVATE\10285a82\fts1k.test			\private\10285a82\fts1k.test
-data=ZPRIVATE\10285a82\fts1l.test			\private\10285a82\fts1l.test
-data=ZPRIVATE\10285a82\fts1m.test			\private\10285a82\fts1m.test
-data=ZPRIVATE\10285a82\fts1n.test			\private\10285a82\fts1n.test
-data=ZPRIVATE\10285a82\fts1o.test			\private\10285a82\fts1o.test
-data=ZPRIVATE\10285a82\fts1porter.test			\private\10285a82\fts1porter.test
-data=ZPRIVATE\10285a82\fts2a.test			\private\10285a82\fts2a.test
-data=ZPRIVATE\10285a82\fts2b.test			\private\10285a82\fts2b.test
-data=ZPRIVATE\10285a82\fts2c.test			\private\10285a82\fts2c.test
-data=ZPRIVATE\10285a82\fts2d.test			\private\10285a82\fts2d.test
-data=ZPRIVATE\10285a82\fts2e.test			\private\10285a82\fts2e.test
-data=ZPRIVATE\10285a82\fts2f.test			\private\10285a82\fts2f.test
-data=ZPRIVATE\10285a82\fts2g.test			\private\10285a82\fts2g.test
-data=ZPRIVATE\10285a82\fts2h.test			\private\10285a82\fts2h.test
-data=ZPRIVATE\10285a82\fts2i.test			\private\10285a82\fts2i.test
-data=ZPRIVATE\10285a82\fts2j.test			\private\10285a82\fts2j.test
-data=ZPRIVATE\10285a82\fts2k.test			\private\10285a82\fts2k.test
-data=ZPRIVATE\10285a82\fts2l.test			\private\10285a82\fts2l.test
-data=ZPRIVATE\10285a82\fts2m.test			\private\10285a82\fts2m.test
-data=ZPRIVATE\10285a82\fts2o.test			\private\10285a82\fts2o.test
-data=ZPRIVATE\10285a82\fts2p.test			\private\10285a82\fts2p.test
-data=ZPRIVATE\10285a82\fts2q.test			\private\10285a82\fts2q.test
-data=ZPRIVATE\10285a82\fts2r.test			\private\10285a82\fts2r.test
-data=ZPRIVATE\10285a82\fts2token.test		\private\10285a82\fts2token.test
-data=ZPRIVATE\10285a82\fts3.test			\private\10285a82\fts3.test
-data=ZPRIVATE\10285a82\fts3aa.test			\private\10285a82\fts3aa.test
-data=ZPRIVATE\10285a82\fts3ab.test			\private\10285a82\fts3ab.test
-data=ZPRIVATE\10285a82\fts3ac.test			\private\10285a82\fts3ac.test
-data=ZPRIVATE\10285a82\fts3ad.test			\private\10285a82\fts3ad.test
-data=ZPRIVATE\10285a82\fts3ae.test			\private\10285a82\fts3ae.test
-data=ZPRIVATE\10285a82\fts3af.test			\private\10285a82\fts3af.test
-data=ZPRIVATE\10285a82\fts3ag.test			\private\10285a82\fts3ag.test
-data=ZPRIVATE\10285a82\fts3ah.test			\private\10285a82\fts3ah.test
-data=ZPRIVATE\10285a82\fts3ai.test			\private\10285a82\fts3ai.test
-data=ZPRIVATE\10285a82\fts3aj.test			\private\10285a82\fts3aj.test
-data=ZPRIVATE\10285a82\fts3ak.test			\private\10285a82\fts3ak.test
-data=ZPRIVATE\10285a82\fts3al.test			\private\10285a82\fts3al.test
-data=ZPRIVATE\10285a82\fts3am.test			\private\10285a82\fts3am.test
-data=ZPRIVATE\10285a82\fts3an.test			\private\10285a82\fts3an.test
-data=ZPRIVATE\10285a82\fts3ao.test			\private\10285a82\fts3ao.test
-data=ZPRIVATE\10285a82\fts3atoken.test		\private\10285a82\fts3atoken.test
-data=ZPRIVATE\10285a82\fts3b.test			\private\10285a82\fts3b.test
-data=ZPRIVATE\10285a82\fts3c.test			\private\10285a82\fts3c.test
-data=ZPRIVATE\10285a82\fts3d.test			\private\10285a82\fts3d.test
-data=ZPRIVATE\10285a82\fts3e.test			\private\10285a82\fts3e.test
-data=ZPRIVATE\10285a82\fts3near.test		\private\10285a82\fts3near.test
-data=ZPRIVATE\10285a82\func.test			\private\10285a82\func.test
-data=ZPRIVATE\10285a82\fuzz.test			\private\10285a82\fuzz.test
-data=ZPRIVATE\10285a82\fuzz2.test			\private\10285a82\fuzz2.test
-data=ZPRIVATE\10285a82\fuzz_malloc.test		\private\10285a82\fuzz_malloc.test
-data=ZPRIVATE\10285a82\hook.test			\private\10285a82\hook.test
-data=ZPRIVATE\10285a82\icu.test				\private\10285a82\icu.test
-data=ZPRIVATE\10285a82\in.test				\private\10285a82\in.test
-data=ZPRIVATE\10285a82\in2.test				\private\10285a82\in2.test
-data=ZPRIVATE\10285a82\in3.test				\private\10285a82\in3.test
-data=ZPRIVATE\10285a82\incrblob.test		\private\10285a82\incrblob.test
-data=ZPRIVATE\10285a82\incrblob2.test		\private\10285a82\incrblob2.test
-data=ZPRIVATE\10285a82\incrblob_err.test	\private\10285a82\incrblob_err.test
-data=ZPRIVATE\10285a82\incrvacuum.test		\private\10285a82\incrvacuum.test
-data=ZPRIVATE\10285a82\incrvacuum2.test		\private\10285a82\incrvacuum2.test
-data=ZPRIVATE\10285a82\incrvacuum_ioerr.test \private\10285a82\incrvacuum_ioerr.test
-data=ZPRIVATE\10285a82\index.test			\private\10285a82\index.test
-data=ZPRIVATE\10285a82\index2.test			\private\10285a82\index2.test
-data=ZPRIVATE\10285a82\index3.test			\private\10285a82\index3.test
-data=ZPRIVATE\10285a82\insert.test			\private\10285a82\insert.test
-data=ZPRIVATE\10285a82\insert2.test			\private\10285a82\insert2.test
-data=ZPRIVATE\10285a82\insert3.test			\private\10285a82\insert3.test
-data=ZPRIVATE\10285a82\insert4.test			\private\10285a82\insert4.test
-data=ZPRIVATE\10285a82\insert5.test			\private\10285a82\insert5.test
-data=ZPRIVATE\10285a82\interrupt.test			\private\10285a82\interrupt.test
-data=ZPRIVATE\10285a82\intpkey.test			\private\10285a82\intpkey.test
-data=ZPRIVATE\10285a82\io.test				\private\10285a82\io.test
-data=ZPRIVATE\10285a82\ioerr.test			\private\10285a82\ioerr.test
-data=ZPRIVATE\10285a82\ioerr2.test			\private\10285a82\ioerr2.test
-data=ZPRIVATE\10285a82\ioerr3.test			\private\10285a82\ioerr3.test
-data=ZPRIVATE\10285a82\ioerr4.test			\private\10285a82\ioerr4.test
-data=ZPRIVATE\10285a82\ioerr5.test			\private\10285a82\ioerr5.test
-data=ZPRIVATE\10285a82\join.test			\private\10285a82\join.test
-data=ZPRIVATE\10285a82\join2.test			\private\10285a82\join2.test
-data=ZPRIVATE\10285a82\join3.test			\private\10285a82\join3.test
-data=ZPRIVATE\10285a82\join4.test			\private\10285a82\join4.test
-data=ZPRIVATE\10285a82\join5.test			\private\10285a82\join5.test
-data=ZPRIVATE\10285a82\journal1.test			\private\10285a82\journal1.test
-data=ZPRIVATE\10285a82\jrnlmode.test			\private\10285a82\jrnlmode.test
-data=ZPRIVATE\10285a82\lastinsert.test			\private\10285a82\lastinsert.test
-data=ZPRIVATE\10285a82\laststmtchanges.test		\private\10285a82\laststmtchanges.test
-data=ZPRIVATE\10285a82\like.test			\private\10285a82\like.test
-data=ZPRIVATE\10285a82\like2.test			\private\10285a82\like2.test
-data=ZPRIVATE\10285a82\limit.test			\private\10285a82\limit.test
-data=ZPRIVATE\10285a82\loadext.test			\private\10285a82\loadext.test
-data=ZPRIVATE\10285a82\loadext2.test			\private\10285a82\loadext2.test
-data=ZPRIVATE\10285a82\lock.test			\private\10285a82\lock.test
-data=ZPRIVATE\10285a82\lock2.test			\private\10285a82\lock2.test
-data=ZPRIVATE\10285a82\lock3.test			\private\10285a82\lock3.test
-data=ZPRIVATE\10285a82\lock4.test			\private\10285a82\lock4.test
-data=ZPRIVATE\10285a82\lock5.test			\private\10285a82\lock5.test
-data=ZPRIVATE\10285a82\lookaside.test		\private\10285a82\lookaside.test
-data=ZPRIVATE\10285a82\main.test			\private\10285a82\main.test
-data=ZPRIVATE\10285a82\malloc.test			\private\10285a82\malloc.test
-data=ZPRIVATE\10285a82\malloc3.test			\private\10285a82\malloc3.test
-data=ZPRIVATE\10285a82\malloc4.test			\private\10285a82\malloc4.test
-data=ZPRIVATE\10285a82\malloc5.test			\private\10285a82\malloc5.test
-data=ZPRIVATE\10285a82\malloc6.test			\private\10285a82\malloc6.test
-data=ZPRIVATE\10285a82\malloc7.test			\private\10285a82\malloc7.test
-data=ZPRIVATE\10285a82\malloc8.test			\private\10285a82\malloc8.test
-data=ZPRIVATE\10285a82\malloc9.test			\private\10285a82\malloc9.test
-data=ZPRIVATE\10285a82\malloca.test			\private\10285a82\malloca.test
-data=ZPRIVATE\10285a82\mallocall.test		\private\10285a82\mallocall.test
-data=ZPRIVATE\10285a82\mallocb.test			\private\10285a82\mallocb.test
-data=ZPRIVATE\10285a82\mallocc.test			\private\10285a82\mallocc.test
-data=ZPRIVATE\10285a82\mallocd.test			\private\10285a82\mallocd.test
-data=ZPRIVATE\10285a82\malloce.test			\private\10285a82\malloce.test
-data=ZPRIVATE\10285a82\mallocf.test			\private\10285a82\mallocf.test
-data=ZPRIVATE\10285a82\mallocg.test			\private\10285a82\mallocg.test
-data=ZPRIVATE\10285a82\malloch.test			\private\10285a82\malloch.test
-data=ZPRIVATE\10285a82\malloci.test			\private\10285a82\malloci.test
-data=ZPRIVATE\10285a82\manydb.test			\private\10285a82\manydb.test
-data=ZPRIVATE\10285a82\memdb.test			\private\10285a82\memdb.test
-data=ZPRIVATE\10285a82\memleak.test			\private\10285a82\memleak.test
-data=ZPRIVATE\10285a82\memsubsys1.test		\private\10285a82\memsubsys1.test
-data=ZPRIVATE\10285a82\memsubsys2.test		\private\10285a82\memsubsys2.test
-data=ZPRIVATE\10285a82\minmax.test			\private\10285a82\minmax.test
-data=ZPRIVATE\10285a82\minmax2.test			\private\10285a82\minmax2.test
-data=ZPRIVATE\10285a82\minmax3.test			\private\10285a82\minmax3.test
-data=ZPRIVATE\10285a82\misc1.test			\private\10285a82\misc1.test
-data=ZPRIVATE\10285a82\misc2.test			\private\10285a82\misc2.test
-data=ZPRIVATE\10285a82\misc3.test			\private\10285a82\misc3.test
-data=ZPRIVATE\10285a82\misc4.test			\private\10285a82\misc4.test
-data=ZPRIVATE\10285a82\misc5.test			\private\10285a82\misc5.test
-data=ZPRIVATE\10285a82\misc6.test			\private\10285a82\misc6.test
-data=ZPRIVATE\10285a82\misc7.test			\private\10285a82\misc7.test
-data=ZPRIVATE\10285a82\misuse.test			\private\10285a82\misuse.test
-data=ZPRIVATE\10285a82\mutex1.test			\private\10285a82\mutex1.test
-data=ZPRIVATE\10285a82\mutex2.test			\private\10285a82\mutex2.test
-data=ZPRIVATE\10285a82\nan.test				\private\10285a82\nan.test
-data=ZPRIVATE\10285a82\notnull.test			\private\10285a82\notnull.test
-data=ZPRIVATE\10285a82\null.test			\private\10285a82\null.test
-data=ZPRIVATE\10285a82\openv2.test			\private\10285a82\openv2.test
-data=ZPRIVATE\10285a82\pager.test			\private\10285a82\pager.test
-data=ZPRIVATE\10285a82\pager2.test			\private\10285a82\pager2.test
-data=ZPRIVATE\10285a82\pager3.test			\private\10285a82\pager3.test
-data=ZPRIVATE\10285a82\pageropt.test			\private\10285a82\pageropt.test
-data=ZPRIVATE\10285a82\pagesize.test			\private\10285a82\pagesize.test
-data=ZPRIVATE\10285a82\permutations.test		\private\10285a82\permutations.test
-data=ZPRIVATE\10285a82\pragma.test			\private\10285a82\pragma.test
-data=ZPRIVATE\10285a82\pragma2.test			\private\10285a82\pragma2.test
-data=ZPRIVATE\10285a82\printf.test			\private\10285a82\printf.test
-data=ZPRIVATE\10285a82\progress.test			\private\10285a82\progress.test
-data=ZPRIVATE\10285a82\ptrchng.test			\private\10285a82\ptrchng.test
-data=ZPRIVATE\10285a82\quick.test			\private\10285a82\quick.test
-data=ZPRIVATE\10285a82\quote.test			\private\10285a82\quote.test
-data=ZPRIVATE\10285a82\rdonly.test			\private\10285a82\rdonly.test
-data=ZPRIVATE\10285a82\reindex.test			\private\10285a82\reindex.test
-data=ZPRIVATE\10285a82\rollback.test			\private\10285a82\rollback.test
-data=ZPRIVATE\10285a82\rowid.test			\private\10285a82\rowid.test
-data=ZPRIVATE\10285a82\rtree.test			\private\10285a82\rtree.test
-data=ZPRIVATE\10285a82\safety.test			\private\10285a82\safety.test
-data=ZPRIVATE\10285a82\schema.test			\private\10285a82\schema.test
-data=ZPRIVATE\10285a82\schema2.test			\private\10285a82\schema2.test
-data=ZPRIVATE\10285a82\select1.test			\private\10285a82\select1.test
-data=ZPRIVATE\10285a82\select2.test			\private\10285a82\select2.test
-data=ZPRIVATE\10285a82\select3.test			\private\10285a82\select3.test
-data=ZPRIVATE\10285a82\select4.test			\private\10285a82\select4.test
-data=ZPRIVATE\10285a82\select5.test			\private\10285a82\select5.test
-data=ZPRIVATE\10285a82\select6.test			\private\10285a82\select6.test
-data=ZPRIVATE\10285a82\select7.test			\private\10285a82\select7.test
-data=ZPRIVATE\10285a82\select8.test			\private\10285a82\select8.test
-data=ZPRIVATE\10285a82\select9.test			\private\10285a82\select9.test
-data=ZPRIVATE\10285a82\selecta.test			\private\10285a82\selecta.test
-data=ZPRIVATE\10285a82\selectb.test			\private\10285a82\selectb.test
-data=ZPRIVATE\10285a82\server1.test			\private\10285a82\server1.test
-data=ZPRIVATE\10285a82\shared.test			\private\10285a82\shared.test
-data=ZPRIVATE\10285a82\shared2.test			\private\10285a82\shared2.test
-data=ZPRIVATE\10285a82\shared3.test			\private\10285a82\shared3.test
-data=ZPRIVATE\10285a82\shared4.test			\private\10285a82\shared4.test
-data=ZPRIVATE\10285a82\shared_err.test			\private\10285a82\shared_err.test
-data=ZPRIVATE\10285a82\shortread1.test			\private\10285a82\shortread1.test
-data=ZPRIVATE\10285a82\sidedelete.test			\private\10285a82\sidedelete.test
-data=ZPRIVATE\10285a82\soak.test			\private\10285a82\soak.test
-data=ZPRIVATE\10285a82\softheap1.test			\private\10285a82\softheap1.test
-data=ZPRIVATE\10285a82\sort.test			\private\10285a82\sort.test
-data=ZPRIVATE\10285a82\speed1.test			\private\10285a82\speed1.test
-data=ZPRIVATE\10285a82\speed1p.test			\private\10285a82\speed1p.test
-data=ZPRIVATE\10285a82\speed2.test			\private\10285a82\speed2.test
-data=ZPRIVATE\10285a82\speed3.test			\private\10285a82\speed3.test
-data=ZPRIVATE\10285a82\speed4.test			\private\10285a82\speed4.test
-data=ZPRIVATE\10285a82\speed4p.test			\private\10285a82\speed4p.test
-data=ZPRIVATE\10285a82\sqllimits1.test			\private\10285a82\sqllimits1.test
-data=ZPRIVATE\10285a82\subquery.test			\private\10285a82\subquery.test
-data=ZPRIVATE\10285a82\subselect.test			\private\10285a82\subselect.test
-data=ZPRIVATE\10285a82\substr.test			\private\10285a82\substr.test
-data=ZPRIVATE\10285a82\sync.test			\private\10285a82\sync.test
-data=ZPRIVATE\10285a82\table.test			\private\10285a82\table.test
-data=ZPRIVATE\10285a82\tableapi.test			\private\10285a82\tableapi.test
-data=ZPRIVATE\10285a82\tclsqlite.test			\private\10285a82\tclsqlite.test
-data=ZPRIVATE\10285a82\tempdb.test			\private\10285a82\tempdb.test
-data=ZPRIVATE\10285a82\temptable.test			\private\10285a82\temptable.test
-data=ZPRIVATE\10285a82\thread001.test			\private\10285a82\thread001.test
-data=ZPRIVATE\10285a82\thread002.test			\private\10285a82\thread002.test
-data=ZPRIVATE\10285a82\thread1.test			\private\10285a82\thread1.test
-data=ZPRIVATE\10285a82\thread2.test			\private\10285a82\thread2.test
-data=ZPRIVATE\10285a82\tkt1435.test			\private\10285a82\tkt1435.test
-data=ZPRIVATE\10285a82\tkt1443.test			\private\10285a82\tkt1443.test
-data=ZPRIVATE\10285a82\tkt1444.test			\private\10285a82\tkt1444.test
-data=ZPRIVATE\10285a82\tkt1449.test			\private\10285a82\tkt1449.test
-data=ZPRIVATE\10285a82\tkt1473.test			\private\10285a82\tkt1473.test
-data=ZPRIVATE\10285a82\tkt1501.test			\private\10285a82\tkt1501.test
-data=ZPRIVATE\10285a82\tkt1512.test			\private\10285a82\tkt1512.test
-data=ZPRIVATE\10285a82\tkt1514.test			\private\10285a82\tkt1514.test
-data=ZPRIVATE\10285a82\tkt1536.test			\private\10285a82\tkt1536.test
-data=ZPRIVATE\10285a82\tkt1537.test			\private\10285a82\tkt1537.test
-data=ZPRIVATE\10285a82\tkt1567.test			\private\10285a82\tkt1567.test
-data=ZPRIVATE\10285a82\tkt1644.test			\private\10285a82\tkt1644.test
-data=ZPRIVATE\10285a82\tkt1667.test			\private\10285a82\tkt1667.test
-data=ZPRIVATE\10285a82\tkt1873.test			\private\10285a82\tkt1873.test
-data=ZPRIVATE\10285a82\tkt2141.test			\private\10285a82\tkt2141.test
-data=ZPRIVATE\10285a82\tkt2192.test			\private\10285a82\tkt2192.test
-data=ZPRIVATE\10285a82\tkt2213.test			\private\10285a82\tkt2213.test
-data=ZPRIVATE\10285a82\tkt2251.test			\private\10285a82\tkt2251.test
-data=ZPRIVATE\10285a82\tkt2285.test			\private\10285a82\tkt2285.test
-data=ZPRIVATE\10285a82\tkt2332.test			\private\10285a82\tkt2332.test
-data=ZPRIVATE\10285a82\tkt2339.test			\private\10285a82\tkt2339.test
-data=ZPRIVATE\10285a82\tkt2391.test			\private\10285a82\tkt2391.test
-data=ZPRIVATE\10285a82\tkt2409.test			\private\10285a82\tkt2409.test
-data=ZPRIVATE\10285a82\tkt2450.test			\private\10285a82\tkt2450.test
-data=ZPRIVATE\10285a82\tkt2640.test			\private\10285a82\tkt2640.test
-data=ZPRIVATE\10285a82\tkt2643.test			\private\10285a82\tkt2643.test
-data=ZPRIVATE\10285a82\tkt2686.test			\private\10285a82\tkt2686.test
-data=ZPRIVATE\10285a82\tkt2767.test			\private\10285a82\tkt2767.test
-data=ZPRIVATE\10285a82\tkt2817.test			\private\10285a82\tkt2817.test
-data=ZPRIVATE\10285a82\tkt2820.test			\private\10285a82\tkt2820.test
-data=ZPRIVATE\10285a82\tkt2822.test			\private\10285a82\tkt2822.test
-data=ZPRIVATE\10285a82\tkt2832.test			\private\10285a82\tkt2832.test
-data=ZPRIVATE\10285a82\tkt2854.test			\private\10285a82\tkt2854.test
-data=ZPRIVATE\10285a82\tkt2920.test			\private\10285a82\tkt2920.test
-data=ZPRIVATE\10285a82\tkt2927.test			\private\10285a82\tkt2927.test
-data=ZPRIVATE\10285a82\tkt2942.test			\private\10285a82\tkt2942.test
-data=ZPRIVATE\10285a82\tkt3080.test			\private\10285a82\tkt3080.test
-data=ZPRIVATE\10285a82\tkt3093.test			\private\10285a82\tkt3093.test
-data=ZPRIVATE\10285a82\tkt3121.test			\private\10285a82\tkt3121.test
-data=ZPRIVATE\10285a82\tkt3201.test			\private\10285a82\tkt3201.test
-data=ZPRIVATE\10285a82\tokenize.test			\private\10285a82\tokenize.test
-data=ZPRIVATE\10285a82\trace.test			\private\10285a82\trace.test
-data=ZPRIVATE\10285a82\trans.test			\private\10285a82\trans.test
-data=ZPRIVATE\10285a82\trigger1.test			\private\10285a82\trigger1.test
-data=ZPRIVATE\10285a82\trigger2.test			\private\10285a82\trigger2.test
-data=ZPRIVATE\10285a82\trigger3.test			\private\10285a82\trigger3.test
-data=ZPRIVATE\10285a82\trigger4.test			\private\10285a82\trigger4.test
-data=ZPRIVATE\10285a82\trigger5.test			\private\10285a82\trigger5.test
-data=ZPRIVATE\10285a82\trigger6.test			\private\10285a82\trigger6.test
-data=ZPRIVATE\10285a82\trigger7.test			\private\10285a82\trigger7.test
-data=ZPRIVATE\10285a82\trigger8.test			\private\10285a82\trigger8.test
-data=ZPRIVATE\10285a82\trigger9.test			\private\10285a82\trigger9.test
-data=ZPRIVATE\10285a82\triggera.test			\private\10285a82\triggera.test
-data=ZPRIVATE\10285a82\triggerb.test			\private\10285a82\triggerb.test
-data=ZPRIVATE\10285a82\types.test			\private\10285a82\types.test
-data=ZPRIVATE\10285a82\types2.test			\private\10285a82\types2.test
-data=ZPRIVATE\10285a82\types3.test			\private\10285a82\types3.test
-data=ZPRIVATE\10285a82\unique.test			\private\10285a82\unique.test
-data=ZPRIVATE\10285a82\update.test			\private\10285a82\update.test
-data=ZPRIVATE\10285a82\utf16align.test			\private\10285a82\utf16align.test
-data=ZPRIVATE\10285a82\vacuum.test			\private\10285a82\vacuum.test
-data=ZPRIVATE\10285a82\vacuum2.test			\private\10285a82\vacuum2.test
-data=ZPRIVATE\10285a82\vacuum3.test			\private\10285a82\vacuum3.test
-data=ZPRIVATE\10285a82\varint.test			\private\10285a82\varint.test
-data=ZPRIVATE\10285a82\veryquick.test			\private\10285a82\veryquick.test
-data=ZPRIVATE\10285a82\view.test			\private\10285a82\view.test
-data=ZPRIVATE\10285a82\vtab1.test			\private\10285a82\vtab1.test
-data=ZPRIVATE\10285a82\vtab2.test			\private\10285a82\vtab2.test
-data=ZPRIVATE\10285a82\vtab3.test			\private\10285a82\vtab3.test
-data=ZPRIVATE\10285a82\vtab4.test			\private\10285a82\vtab4.test
-data=ZPRIVATE\10285a82\vtab5.test			\private\10285a82\vtab5.test
-data=ZPRIVATE\10285a82\vtab6.test			\private\10285a82\vtab6.test
-data=ZPRIVATE\10285a82\vtab7.test			\private\10285a82\vtab7.test
-data=ZPRIVATE\10285a82\vtab8.test			\private\10285a82\vtab8.test
-data=ZPRIVATE\10285a82\vtab9.test			\private\10285a82\vtab9.test
-data=ZPRIVATE\10285a82\vtaba.test			\private\10285a82\vtaba.test
-data=ZPRIVATE\10285a82\vtabb.test			\private\10285a82\vtabb.test
-data=ZPRIVATE\10285a82\vtabc.test			\private\10285a82\vtabc.test
-data=ZPRIVATE\10285a82\vtab_alter.test			\private\10285a82\vtab_alter.test
-data=ZPRIVATE\10285a82\vtab_err.test			\private\10285a82\vtab_err.test
-data=ZPRIVATE\10285a82\vtab_shared.test			\private\10285a82\vtab_shared.test
-data=ZPRIVATE\10285a82\where.test			\private\10285a82\where.test
-data=ZPRIVATE\10285a82\where2.test			\private\10285a82\where2.test
-data=ZPRIVATE\10285a82\where3.test			\private\10285a82\where3.test
-data=ZPRIVATE\10285a82\where4.test			\private\10285a82\where4.test
-data=ZPRIVATE\10285a82\where5.test			\private\10285a82\where5.test
-data=ZPRIVATE\10285a82\where6.test			\private\10285a82\where6.test
-data=ZPRIVATE\10285a82\zeroblob.test			\private\10285a82\zeroblob.test
-data=ZPRIVATE\212C3129\t_sqliteapi.txt		\private\212c3129\t_sqliteapi.txt
+data=ZPRIVATE\10285A82\aggerror.test			\PRIVATE\10285A82\aggerror.test
+data=ZPRIVATE\10285A82\all.test				\PRIVATE\10285A82\all.test
+data=ZPRIVATE\10285A82\alter.test			\PRIVATE\10285A82\alter.test
+data=ZPRIVATE\10285A82\alter2.test			\PRIVATE\10285A82\alter2.test
+data=ZPRIVATE\10285A82\alter3.test			\PRIVATE\10285A82\alter3.test
+data=ZPRIVATE\10285A82\altermalloc.test			\PRIVATE\10285A82\altermalloc.test
+data=ZPRIVATE\10285A82\analyze.test			\PRIVATE\10285A82\analyze.test
+data=ZPRIVATE\10285A82\async.test			\PRIVATE\10285A82\async.test
+data=ZPRIVATE\10285A82\async2.test			\PRIVATE\10285A82\async2.test
+data=ZPRIVATE\10285A82\async3.test			\PRIVATE\10285A82\async3.test
+data=ZPRIVATE\10285A82\attach.test			\PRIVATE\10285A82\attach.test
+data=ZPRIVATE\10285A82\attach2.test			\PRIVATE\10285A82\attach2.test
+data=ZPRIVATE\10285A82\attach3.test			\PRIVATE\10285A82\attach3.test
+data=ZPRIVATE\10285A82\attachmalloc.test		\PRIVATE\10285A82\attachmalloc.test
+data=ZPRIVATE\10285A82\auth.test			\PRIVATE\10285A82\auth.test
+data=ZPRIVATE\10285A82\auth2.test			\PRIVATE\10285A82\auth2.test
+data=ZPRIVATE\10285A82\autoinc.test			\PRIVATE\10285A82\autoinc.test
+data=ZPRIVATE\10285A82\autovacuum.test			\PRIVATE\10285A82\autovacuum.test
+data=ZPRIVATE\10285A82\autovacuum_ioerr2.test		\PRIVATE\10285A82\autovacuum_ioerr2.test
+data=ZPRIVATE\10285A82\avtrans.test			\PRIVATE\10285A82\avtrans.test
+data=ZPRIVATE\10285A82\badutf.test			\PRIVATE\10285A82\badutf.test
+data=ZPRIVATE\10285A82\between.test			\PRIVATE\10285A82\between.test
+data=ZPRIVATE\10285A82\bigfile.test			\PRIVATE\10285A82\bigfile.test
+data=ZPRIVATE\10285A82\bigrow.test			\PRIVATE\10285A82\bigrow.test
+data=ZPRIVATE\10285A82\bind.test			\PRIVATE\10285A82\bind.test
+data=ZPRIVATE\10285A82\bindxfer.test			\PRIVATE\10285A82\bindxfer.test
+data=ZPRIVATE\10285A82\bitvec.test			\PRIVATE\10285A82\bitvec.test
+data=ZPRIVATE\10285A82\blob.test			\PRIVATE\10285A82\blob.test
+data=ZPRIVATE\10285A82\busy.test			\PRIVATE\10285A82\busy.test
+data=ZPRIVATE\10285A82\cache.test			\PRIVATE\10285A82\cache.test
+data=ZPRIVATE\10285A82\capi2.test			\PRIVATE\10285A82\capi2.test
+data=ZPRIVATE\10285A82\capi3.test			\PRIVATE\10285A82\capi3.test
+data=ZPRIVATE\10285A82\capi3b.test			\PRIVATE\10285A82\capi3b.test
+data=ZPRIVATE\10285A82\capi3c.test			\PRIVATE\10285A82\capi3c.test
+data=ZPRIVATE\10285A82\capi3d.test			\PRIVATE\10285A82\capi3d.test
+data=ZPRIVATE\10285A82\cast.test			\PRIVATE\10285A82\cast.test
+data=ZPRIVATE\10285A82\check.test			\PRIVATE\10285A82\check.test
+data=ZPRIVATE\10285A82\collate1.test			\PRIVATE\10285A82\collate1.test
+data=ZPRIVATE\10285A82\collate2.test			\PRIVATE\10285A82\collate2.test
+data=ZPRIVATE\10285A82\collate3.test			\PRIVATE\10285A82\collate3.test
+data=ZPRIVATE\10285A82\collate4.test			\PRIVATE\10285A82\collate4.test
+data=ZPRIVATE\10285A82\collate5.test			\PRIVATE\10285A82\collate5.test
+data=ZPRIVATE\10285A82\collate6.test			\PRIVATE\10285A82\collate6.test
+data=ZPRIVATE\10285A82\collate7.test			\PRIVATE\10285A82\collate7.test
+data=ZPRIVATE\10285A82\collate8.test			\PRIVATE\10285A82\collate8.test
+data=ZPRIVATE\10285A82\collate9.test			\PRIVATE\10285A82\collate9.test
+data=ZPRIVATE\10285A82\collateA.test			\PRIVATE\10285A82\collateA.test
+data=ZPRIVATE\10285A82\colmeta.test			\PRIVATE\10285A82\colmeta.test
+data=ZPRIVATE\10285A82\colname.test			\PRIVATE\10285A82\colname.test
+data=ZPRIVATE\10285A82\conflict.test			\PRIVATE\10285A82\conflict.test
+data=ZPRIVATE\10285A82\corrupt.test			\PRIVATE\10285A82\corrupt.test
+data=ZPRIVATE\10285A82\corrupt2.test			\PRIVATE\10285A82\corrupt2.test
+data=ZPRIVATE\10285A82\corrupt3.test			\PRIVATE\10285A82\corrupt3.test
+data=ZPRIVATE\10285A82\corrupt4.test			\PRIVATE\10285A82\corrupt4.test
+data=ZPRIVATE\10285A82\corrupt5.test			\PRIVATE\10285A82\corrupt5.test
+data=ZPRIVATE\10285A82\corrupt6.test			\PRIVATE\10285A82\corrupt6.test
+data=ZPRIVATE\10285A82\corrupt7.test			\PRIVATE\10285A82\corrupt7.test
+data=ZPRIVATE\10285A82\corrupt8.test			\PRIVATE\10285A82\corrupt8.test
+data=ZPRIVATE\10285A82\corrupt9.test			\PRIVATE\10285A82\corrupt9.test
+data=ZPRIVATE\10285A82\corruptA.test			\PRIVATE\10285A82\corruptA.test
+data=ZPRIVATE\10285A82\crash.test			\PRIVATE\10285A82\crash.test
+data=ZPRIVATE\10285A82\crash2.test			\PRIVATE\10285A82\crash2.test
+data=ZPRIVATE\10285A82\crash3.test			\PRIVATE\10285A82\crash3.test
+data=ZPRIVATE\10285A82\crash4.test			\PRIVATE\10285A82\crash4.test
+data=ZPRIVATE\10285A82\crash5.test			\PRIVATE\10285A82\crash5.test
+data=ZPRIVATE\10285A82\crash6.test			\PRIVATE\10285A82\crash6.test
+data=ZPRIVATE\10285A82\crash7.test			\PRIVATE\10285A82\crash7.test
+data=ZPRIVATE\10285A82\createtab.test		\PRIVATE\10285A82\createtab.test
+data=ZPRIVATE\10285A82\cse.test				\PRIVATE\10285A82\cse.test
+data=ZPRIVATE\10285A82\date.test			\PRIVATE\10285A82\date.test
+data=ZPRIVATE\10285A82\default.test			\PRIVATE\10285A82\default.test
+data=ZPRIVATE\10285A82\delete.test			\PRIVATE\10285A82\delete.test
+data=ZPRIVATE\10285A82\delete2.test			\PRIVATE\10285A82\delete2.test
+data=ZPRIVATE\10285A82\delete3.test			\PRIVATE\10285A82\delete3.test
+data=ZPRIVATE\10285A82\descidx1.test			\PRIVATE\10285A82\descidx1.test
+data=ZPRIVATE\10285A82\descidx2.test			\PRIVATE\10285A82\descidx2.test
+data=ZPRIVATE\10285A82\descidx3.test			\PRIVATE\10285A82\descidx3.test
+data=ZPRIVATE\10285A82\diskfull.test			\PRIVATE\10285A82\diskfull.test
+data=ZPRIVATE\10285A82\distinctagg.test			\PRIVATE\10285A82\distinctagg.test
+data=ZPRIVATE\10285A82\enc.test				\PRIVATE\10285A82\enc.test
+data=ZPRIVATE\10285A82\enc2.test			\PRIVATE\10285A82\enc2.test
+data=ZPRIVATE\10285A82\enc3.test			\PRIVATE\10285A82\enc3.test
+data=ZPRIVATE\10285A82\eval.test			\PRIVATE\10285A82\eval.test
+data=ZPRIVATE\10285A82\exclusive.test			\PRIVATE\10285A82\exclusive.test
+data=ZPRIVATE\10285A82\exclusive2.test			\PRIVATE\10285A82\exclusive2.test
+data=ZPRIVATE\10285A82\exec.test			\PRIVATE\10285A82\exec.test
+data=ZPRIVATE\10285A82\expr.test			\PRIVATE\10285A82\expr.test
+data=ZPRIVATE\10285A82\filectrl.test		\PRIVATE\10285A82\filectrl.test
+data=ZPRIVATE\10285A82\filefmt.test			\PRIVATE\10285A82\filefmt.test
+data=ZPRIVATE\10285A82\fkey1.test			\PRIVATE\10285A82\fkey1.test
+data=ZPRIVATE\10285A82\format4.test			\PRIVATE\10285A82\format4.test
+data=ZPRIVATE\10285A82\fts1a.test			\PRIVATE\10285A82\fts1a.test
+data=ZPRIVATE\10285A82\fts1b.test			\PRIVATE\10285A82\fts1b.test
+data=ZPRIVATE\10285A82\fts1c.test			\PRIVATE\10285A82\fts1c.test
+data=ZPRIVATE\10285A82\fts1d.test			\PRIVATE\10285A82\fts1d.test
+data=ZPRIVATE\10285A82\fts1e.test			\PRIVATE\10285A82\fts1e.test
+data=ZPRIVATE\10285A82\fts1f.test			\PRIVATE\10285A82\fts1f.test
+data=ZPRIVATE\10285A82\fts1i.test			\PRIVATE\10285A82\fts1i.test
+data=ZPRIVATE\10285A82\fts1j.test			\PRIVATE\10285A82\fts1j.test
+data=ZPRIVATE\10285A82\fts1k.test			\PRIVATE\10285A82\fts1k.test
+data=ZPRIVATE\10285A82\fts1l.test			\PRIVATE\10285A82\fts1l.test
+data=ZPRIVATE\10285A82\fts1m.test			\PRIVATE\10285A82\fts1m.test
+data=ZPRIVATE\10285A82\fts1n.test			\PRIVATE\10285A82\fts1n.test
+data=ZPRIVATE\10285A82\fts1o.test			\PRIVATE\10285A82\fts1o.test
+data=ZPRIVATE\10285A82\fts1porter.test			\PRIVATE\10285A82\fts1porter.test
+data=ZPRIVATE\10285A82\fts2a.test			\PRIVATE\10285A82\fts2a.test
+data=ZPRIVATE\10285A82\fts2b.test			\PRIVATE\10285A82\fts2b.test
+data=ZPRIVATE\10285A82\fts2c.test			\PRIVATE\10285A82\fts2c.test
+data=ZPRIVATE\10285A82\fts2d.test			\PRIVATE\10285A82\fts2d.test
+data=ZPRIVATE\10285A82\fts2e.test			\PRIVATE\10285A82\fts2e.test
+data=ZPRIVATE\10285A82\fts2f.test			\PRIVATE\10285A82\fts2f.test
+data=ZPRIVATE\10285A82\fts2g.test			\PRIVATE\10285A82\fts2g.test
+data=ZPRIVATE\10285A82\fts2h.test			\PRIVATE\10285A82\fts2h.test
+data=ZPRIVATE\10285A82\fts2i.test			\PRIVATE\10285A82\fts2i.test
+data=ZPRIVATE\10285A82\fts2j.test			\PRIVATE\10285A82\fts2j.test
+data=ZPRIVATE\10285A82\fts2k.test			\PRIVATE\10285A82\fts2k.test
+data=ZPRIVATE\10285A82\fts2l.test			\PRIVATE\10285A82\fts2l.test
+data=ZPRIVATE\10285A82\fts2m.test			\PRIVATE\10285A82\fts2m.test
+data=ZPRIVATE\10285A82\fts2o.test			\PRIVATE\10285A82\fts2o.test
+data=ZPRIVATE\10285A82\fts2p.test			\PRIVATE\10285A82\fts2p.test
+data=ZPRIVATE\10285A82\fts2q.test			\PRIVATE\10285A82\fts2q.test
+data=ZPRIVATE\10285A82\fts2r.test			\PRIVATE\10285A82\fts2r.test
+data=ZPRIVATE\10285A82\fts2token.test		\PRIVATE\10285A82\fts2token.test
+data=ZPRIVATE\10285A82\fts3.test			\PRIVATE\10285A82\fts3.test
+data=ZPRIVATE\10285A82\fts3aa.test			\PRIVATE\10285A82\fts3aa.test
+data=ZPRIVATE\10285A82\fts3ab.test			\PRIVATE\10285A82\fts3ab.test
+data=ZPRIVATE\10285A82\fts3ac.test			\PRIVATE\10285A82\fts3ac.test
+data=ZPRIVATE\10285A82\fts3ad.test			\PRIVATE\10285A82\fts3ad.test
+data=ZPRIVATE\10285A82\fts3ae.test			\PRIVATE\10285A82\fts3ae.test
+data=ZPRIVATE\10285A82\fts3af.test			\PRIVATE\10285A82\fts3af.test
+data=ZPRIVATE\10285A82\fts3ag.test			\PRIVATE\10285A82\fts3ag.test
+data=ZPRIVATE\10285A82\fts3ah.test			\PRIVATE\10285A82\fts3ah.test
+data=ZPRIVATE\10285A82\fts3ai.test			\PRIVATE\10285A82\fts3ai.test
+data=ZPRIVATE\10285A82\fts3aj.test			\PRIVATE\10285A82\fts3aj.test
+data=ZPRIVATE\10285A82\fts3ak.test			\PRIVATE\10285A82\fts3ak.test
+data=ZPRIVATE\10285A82\fts3al.test			\PRIVATE\10285A82\fts3al.test
+data=ZPRIVATE\10285A82\fts3am.test			\PRIVATE\10285A82\fts3am.test
+data=ZPRIVATE\10285A82\fts3an.test			\PRIVATE\10285A82\fts3an.test
+data=ZPRIVATE\10285A82\fts3ao.test			\PRIVATE\10285A82\fts3ao.test
+data=ZPRIVATE\10285A82\fts3atoken.test		\PRIVATE\10285A82\fts3atoken.test
+data=ZPRIVATE\10285A82\fts3b.test			\PRIVATE\10285A82\fts3b.test
+data=ZPRIVATE\10285A82\fts3c.test			\PRIVATE\10285A82\fts3c.test
+data=ZPRIVATE\10285A82\fts3d.test			\PRIVATE\10285A82\fts3d.test
+data=ZPRIVATE\10285A82\fts3e.test			\PRIVATE\10285A82\fts3e.test
+data=ZPRIVATE\10285A82\fts3near.test		\PRIVATE\10285A82\fts3near.test
+data=ZPRIVATE\10285A82\func.test			\PRIVATE\10285A82\func.test
+data=ZPRIVATE\10285A82\fuzz.test			\PRIVATE\10285A82\fuzz.test
+data=ZPRIVATE\10285A82\fuzz2.test			\PRIVATE\10285A82\fuzz2.test
+data=ZPRIVATE\10285A82\fuzz_malloc.test		\PRIVATE\10285A82\fuzz_malloc.test
+data=ZPRIVATE\10285A82\hook.test			\PRIVATE\10285A82\hook.test
+data=ZPRIVATE\10285A82\icu.test				\PRIVATE\10285A82\icu.test
+data=ZPRIVATE\10285A82\in.test				\PRIVATE\10285A82\in.test
+data=ZPRIVATE\10285A82\in2.test				\PRIVATE\10285A82\in2.test
+data=ZPRIVATE\10285A82\in3.test				\PRIVATE\10285A82\in3.test
+data=ZPRIVATE\10285A82\incrblob.test		\PRIVATE\10285A82\incrblob.test
+data=ZPRIVATE\10285A82\incrblob2.test		\PRIVATE\10285A82\incrblob2.test
+data=ZPRIVATE\10285A82\incrblob_err.test	\PRIVATE\10285A82\incrblob_err.test
+data=ZPRIVATE\10285A82\incrvacuum.test		\PRIVATE\10285A82\incrvacuum.test
+data=ZPRIVATE\10285A82\incrvacuum2.test		\PRIVATE\10285A82\incrvacuum2.test
+data=ZPRIVATE\10285A82\incrvacuum_ioerr.test \PRIVATE\10285A82\incrvacuum_ioerr.test
+data=ZPRIVATE\10285A82\index.test			\PRIVATE\10285A82\index.test
+data=ZPRIVATE\10285A82\index2.test			\PRIVATE\10285A82\index2.test
+data=ZPRIVATE\10285A82\index3.test			\PRIVATE\10285A82\index3.test
+data=ZPRIVATE\10285A82\insert.test			\PRIVATE\10285A82\insert.test
+data=ZPRIVATE\10285A82\insert2.test			\PRIVATE\10285A82\insert2.test
+data=ZPRIVATE\10285A82\insert3.test			\PRIVATE\10285A82\insert3.test
+data=ZPRIVATE\10285A82\insert4.test			\PRIVATE\10285A82\insert4.test
+data=ZPRIVATE\10285A82\insert5.test			\PRIVATE\10285A82\insert5.test
+data=ZPRIVATE\10285A82\interrupt.test			\PRIVATE\10285A82\interrupt.test
+data=ZPRIVATE\10285A82\intpkey.test			\PRIVATE\10285A82\intpkey.test
+data=ZPRIVATE\10285A82\io.test				\PRIVATE\10285A82\io.test
+data=ZPRIVATE\10285A82\ioerr.test			\PRIVATE\10285A82\ioerr.test
+data=ZPRIVATE\10285A82\ioerr2.test			\PRIVATE\10285A82\ioerr2.test
+data=ZPRIVATE\10285A82\ioerr3.test			\PRIVATE\10285A82\ioerr3.test
+data=ZPRIVATE\10285A82\ioerr4.test			\PRIVATE\10285A82\ioerr4.test
+data=ZPRIVATE\10285A82\ioerr5.test			\PRIVATE\10285A82\ioerr5.test
+data=ZPRIVATE\10285A82\join.test			\PRIVATE\10285A82\join.test
+data=ZPRIVATE\10285A82\join2.test			\PRIVATE\10285A82\join2.test
+data=ZPRIVATE\10285A82\join3.test			\PRIVATE\10285A82\join3.test
+data=ZPRIVATE\10285A82\join4.test			\PRIVATE\10285A82\join4.test
+data=ZPRIVATE\10285A82\join5.test			\PRIVATE\10285A82\join5.test
+data=ZPRIVATE\10285A82\journal1.test			\PRIVATE\10285A82\journal1.test
+data=ZPRIVATE\10285A82\jrnlmode.test			\PRIVATE\10285A82\jrnlmode.test
+data=ZPRIVATE\10285A82\lastinsert.test			\PRIVATE\10285A82\lastinsert.test
+data=ZPRIVATE\10285A82\laststmtchanges.test		\PRIVATE\10285A82\laststmtchanges.test
+data=ZPRIVATE\10285A82\like.test			\PRIVATE\10285A82\like.test
+data=ZPRIVATE\10285A82\like2.test			\PRIVATE\10285A82\like2.test
+data=ZPRIVATE\10285A82\limit.test			\PRIVATE\10285A82\limit.test
+data=ZPRIVATE\10285A82\loadext.test			\PRIVATE\10285A82\loadext.test
+data=ZPRIVATE\10285A82\loadext2.test			\PRIVATE\10285A82\loadext2.test
+data=ZPRIVATE\10285A82\lock.test			\PRIVATE\10285A82\lock.test
+data=ZPRIVATE\10285A82\lock2.test			\PRIVATE\10285A82\lock2.test
+data=ZPRIVATE\10285A82\lock3.test			\PRIVATE\10285A82\lock3.test
+data=ZPRIVATE\10285A82\lock4.test			\PRIVATE\10285A82\lock4.test
+data=ZPRIVATE\10285A82\lock5.test			\PRIVATE\10285A82\lock5.test
+data=ZPRIVATE\10285A82\lookaside.test		\PRIVATE\10285A82\lookaside.test
+data=ZPRIVATE\10285A82\main.test			\PRIVATE\10285A82\main.test
+data=ZPRIVATE\10285A82\malloc.test			\PRIVATE\10285A82\malloc.test
+data=ZPRIVATE\10285A82\malloc3.test			\PRIVATE\10285A82\malloc3.test
+data=ZPRIVATE\10285A82\malloc4.test			\PRIVATE\10285A82\malloc4.test
+data=ZPRIVATE\10285A82\malloc5.test			\PRIVATE\10285A82\malloc5.test
+data=ZPRIVATE\10285A82\malloc6.test			\PRIVATE\10285A82\malloc6.test
+data=ZPRIVATE\10285A82\malloc7.test			\PRIVATE\10285A82\malloc7.test
+data=ZPRIVATE\10285A82\malloc8.test			\PRIVATE\10285A82\malloc8.test
+data=ZPRIVATE\10285A82\malloc9.test			\PRIVATE\10285A82\malloc9.test
+data=ZPRIVATE\10285A82\mallocA.test			\PRIVATE\10285A82\mallocA.test
+data=ZPRIVATE\10285A82\mallocAll.test		\PRIVATE\10285A82\mallocAll.test
+data=ZPRIVATE\10285A82\mallocB.test			\PRIVATE\10285A82\mallocB.test
+data=ZPRIVATE\10285A82\mallocC.test			\PRIVATE\10285A82\mallocC.test
+data=ZPRIVATE\10285A82\mallocD.test			\PRIVATE\10285A82\mallocD.test
+data=ZPRIVATE\10285A82\mallocE.test			\PRIVATE\10285A82\mallocE.test
+data=ZPRIVATE\10285A82\mallocF.test			\PRIVATE\10285A82\mallocF.test
+data=ZPRIVATE\10285A82\mallocG.test			\PRIVATE\10285A82\mallocG.test
+data=ZPRIVATE\10285A82\mallocH.test			\PRIVATE\10285A82\mallocH.test
+data=ZPRIVATE\10285A82\mallocI.test			\PRIVATE\10285A82\mallocI.test
+data=ZPRIVATE\10285A82\manydb.test			\PRIVATE\10285A82\manydb.test
+data=ZPRIVATE\10285A82\memdb.test			\PRIVATE\10285A82\memdb.test
+data=ZPRIVATE\10285A82\memleak.test			\PRIVATE\10285A82\memleak.test
+data=ZPRIVATE\10285A82\memsubsys1.test		\PRIVATE\10285A82\memsubsys1.test
+data=ZPRIVATE\10285A82\memsubsys2.test		\PRIVATE\10285A82\memsubsys2.test
+data=ZPRIVATE\10285A82\minmax.test			\PRIVATE\10285A82\minmax.test
+data=ZPRIVATE\10285A82\minmax2.test			\PRIVATE\10285A82\minmax2.test
+data=ZPRIVATE\10285A82\minmax3.test			\PRIVATE\10285A82\minmax3.test
+data=ZPRIVATE\10285A82\misc1.test			\PRIVATE\10285A82\misc1.test
+data=ZPRIVATE\10285A82\misc2.test			\PRIVATE\10285A82\misc2.test
+data=ZPRIVATE\10285A82\misc3.test			\PRIVATE\10285A82\misc3.test
+data=ZPRIVATE\10285A82\misc4.test			\PRIVATE\10285A82\misc4.test
+data=ZPRIVATE\10285A82\misc5.test			\PRIVATE\10285A82\misc5.test
+data=ZPRIVATE\10285A82\misc6.test			\PRIVATE\10285A82\misc6.test
+data=ZPRIVATE\10285A82\misc7.test			\PRIVATE\10285A82\misc7.test
+data=ZPRIVATE\10285A82\misuse.test			\PRIVATE\10285A82\misuse.test
+data=ZPRIVATE\10285A82\mutex1.test			\PRIVATE\10285A82\mutex1.test
+data=ZPRIVATE\10285A82\mutex2.test			\PRIVATE\10285A82\mutex2.test
+data=ZPRIVATE\10285A82\nan.test				\PRIVATE\10285A82\nan.test
+data=ZPRIVATE\10285A82\notnull.test			\PRIVATE\10285A82\notnull.test
+data=ZPRIVATE\10285A82\null.test			\PRIVATE\10285A82\null.test
+data=ZPRIVATE\10285A82\openv2.test			\PRIVATE\10285A82\openv2.test
+data=ZPRIVATE\10285A82\pager.test			\PRIVATE\10285A82\pager.test
+data=ZPRIVATE\10285A82\pager2.test			\PRIVATE\10285A82\pager2.test
+data=ZPRIVATE\10285A82\pager3.test			\PRIVATE\10285A82\pager3.test
+data=ZPRIVATE\10285A82\pageropt.test			\PRIVATE\10285A82\pageropt.test
+data=ZPRIVATE\10285A82\pagesize.test			\PRIVATE\10285A82\pagesize.test
+data=ZPRIVATE\10285A82\permutations.test		\PRIVATE\10285A82\permutations.test
+data=ZPRIVATE\10285A82\pragma.test			\PRIVATE\10285A82\pragma.test
+data=ZPRIVATE\10285A82\pragma2.test			\PRIVATE\10285A82\pragma2.test
+data=ZPRIVATE\10285A82\printf.test			\PRIVATE\10285A82\printf.test
+data=ZPRIVATE\10285A82\progress.test			\PRIVATE\10285A82\progress.test
+data=ZPRIVATE\10285A82\ptrchng.test			\PRIVATE\10285A82\ptrchng.test
+data=ZPRIVATE\10285A82\quick.test			\PRIVATE\10285A82\quick.test
+data=ZPRIVATE\10285A82\quote.test			\PRIVATE\10285A82\quote.test
+data=ZPRIVATE\10285A82\rdonly.test			\PRIVATE\10285A82\rdonly.test
+data=ZPRIVATE\10285A82\reindex.test			\PRIVATE\10285A82\reindex.test
+data=ZPRIVATE\10285A82\rollback.test			\PRIVATE\10285A82\rollback.test
+data=ZPRIVATE\10285A82\rowid.test			\PRIVATE\10285A82\rowid.test
+data=ZPRIVATE\10285A82\rtree.test			\PRIVATE\10285A82\rtree.test
+data=ZPRIVATE\10285A82\safety.test			\PRIVATE\10285A82\safety.test
+data=ZPRIVATE\10285A82\schema.test			\PRIVATE\10285A82\schema.test
+data=ZPRIVATE\10285A82\schema2.test			\PRIVATE\10285A82\schema2.test
+data=ZPRIVATE\10285A82\select1.test			\PRIVATE\10285A82\select1.test
+data=ZPRIVATE\10285A82\select2.test			\PRIVATE\10285A82\select2.test
+data=ZPRIVATE\10285A82\select3.test			\PRIVATE\10285A82\select3.test
+data=ZPRIVATE\10285A82\select4.test			\PRIVATE\10285A82\select4.test
+data=ZPRIVATE\10285A82\select5.test			\PRIVATE\10285A82\select5.test
+data=ZPRIVATE\10285A82\select6.test			\PRIVATE\10285A82\select6.test
+data=ZPRIVATE\10285A82\select7.test			\PRIVATE\10285A82\select7.test
+data=ZPRIVATE\10285A82\select8.test			\PRIVATE\10285A82\select8.test
+data=ZPRIVATE\10285A82\select9.test			\PRIVATE\10285A82\select9.test
+data=ZPRIVATE\10285A82\selectA.test			\PRIVATE\10285A82\selectA.test
+data=ZPRIVATE\10285A82\selectB.test			\PRIVATE\10285A82\selectB.test
+data=ZPRIVATE\10285A82\server1.test			\PRIVATE\10285A82\server1.test
+data=ZPRIVATE\10285A82\shared.test			\PRIVATE\10285A82\shared.test
+data=ZPRIVATE\10285A82\shared2.test			\PRIVATE\10285A82\shared2.test
+data=ZPRIVATE\10285A82\shared3.test			\PRIVATE\10285A82\shared3.test
+data=ZPRIVATE\10285A82\shared4.test			\PRIVATE\10285A82\shared4.test
+data=ZPRIVATE\10285A82\shared_err.test			\PRIVATE\10285A82\shared_err.test
+data=ZPRIVATE\10285A82\shortread1.test			\PRIVATE\10285A82\shortread1.test
+data=ZPRIVATE\10285A82\sidedelete.test			\PRIVATE\10285A82\sidedelete.test
+data=ZPRIVATE\10285A82\soak.test			\PRIVATE\10285A82\soak.test
+data=ZPRIVATE\10285A82\softheap1.test			\PRIVATE\10285A82\softheap1.test
+data=ZPRIVATE\10285A82\sort.test			\PRIVATE\10285A82\sort.test
+data=ZPRIVATE\10285A82\speed1.test			\PRIVATE\10285A82\speed1.test
+data=ZPRIVATE\10285A82\speed1p.test			\PRIVATE\10285A82\speed1p.test
+data=ZPRIVATE\10285A82\speed2.test			\PRIVATE\10285A82\speed2.test
+data=ZPRIVATE\10285A82\speed3.test			\PRIVATE\10285A82\speed3.test
+data=ZPRIVATE\10285A82\speed4.test			\PRIVATE\10285A82\speed4.test
+data=ZPRIVATE\10285A82\speed4p.test			\PRIVATE\10285A82\speed4p.test
+data=ZPRIVATE\10285A82\sqllimits1.test			\PRIVATE\10285A82\sqllimits1.test
+data=ZPRIVATE\10285A82\subquery.test			\PRIVATE\10285A82\subquery.test
+data=ZPRIVATE\10285A82\subselect.test			\PRIVATE\10285A82\subselect.test
+data=ZPRIVATE\10285A82\substr.test			\PRIVATE\10285A82\substr.test
+data=ZPRIVATE\10285A82\sync.test			\PRIVATE\10285A82\sync.test
+data=ZPRIVATE\10285A82\table.test			\PRIVATE\10285A82\table.test
+data=ZPRIVATE\10285A82\tableapi.test			\PRIVATE\10285A82\tableapi.test
+data=ZPRIVATE\10285A82\tclsqlite.test			\PRIVATE\10285A82\tclsqlite.test
+data=ZPRIVATE\10285A82\tempdb.test			\PRIVATE\10285A82\tempdb.test
+data=ZPRIVATE\10285A82\temptable.test			\PRIVATE\10285A82\temptable.test
+data=ZPRIVATE\10285A82\thread001.test			\PRIVATE\10285A82\thread001.test
+data=ZPRIVATE\10285A82\thread002.test			\PRIVATE\10285A82\thread002.test
+data=ZPRIVATE\10285A82\thread1.test			\PRIVATE\10285A82\thread1.test
+data=ZPRIVATE\10285A82\thread2.test			\PRIVATE\10285A82\thread2.test
+data=ZPRIVATE\10285A82\tkt1435.test			\PRIVATE\10285A82\tkt1435.test
+data=ZPRIVATE\10285A82\tkt1443.test			\PRIVATE\10285A82\tkt1443.test
+data=ZPRIVATE\10285A82\tkt1444.test			\PRIVATE\10285A82\tkt1444.test
+data=ZPRIVATE\10285A82\tkt1449.test			\PRIVATE\10285A82\tkt1449.test
+data=ZPRIVATE\10285A82\tkt1473.test			\PRIVATE\10285A82\tkt1473.test
+data=ZPRIVATE\10285A82\tkt1501.test			\PRIVATE\10285A82\tkt1501.test
+data=ZPRIVATE\10285A82\tkt1512.test			\PRIVATE\10285A82\tkt1512.test
+data=ZPRIVATE\10285A82\tkt1514.test			\PRIVATE\10285A82\tkt1514.test
+data=ZPRIVATE\10285A82\tkt1536.test			\PRIVATE\10285A82\tkt1536.test
+data=ZPRIVATE\10285A82\tkt1537.test			\PRIVATE\10285A82\tkt1537.test
+data=ZPRIVATE\10285A82\tkt1567.test			\PRIVATE\10285A82\tkt1567.test
+data=ZPRIVATE\10285A82\tkt1644.test			\PRIVATE\10285A82\tkt1644.test
+data=ZPRIVATE\10285A82\tkt1667.test			\PRIVATE\10285A82\tkt1667.test
+data=ZPRIVATE\10285A82\tkt1873.test			\PRIVATE\10285A82\tkt1873.test
+data=ZPRIVATE\10285A82\tkt2141.test			\PRIVATE\10285A82\tkt2141.test
+data=ZPRIVATE\10285A82\tkt2192.test			\PRIVATE\10285A82\tkt2192.test
+data=ZPRIVATE\10285A82\tkt2213.test			\PRIVATE\10285A82\tkt2213.test
+data=ZPRIVATE\10285A82\tkt2251.test			\PRIVATE\10285A82\tkt2251.test
+data=ZPRIVATE\10285A82\tkt2285.test			\PRIVATE\10285A82\tkt2285.test
+data=ZPRIVATE\10285A82\tkt2332.test			\PRIVATE\10285A82\tkt2332.test
+data=ZPRIVATE\10285A82\tkt2339.test			\PRIVATE\10285A82\tkt2339.test
+data=ZPRIVATE\10285A82\tkt2391.test			\PRIVATE\10285A82\tkt2391.test
+data=ZPRIVATE\10285A82\tkt2409.test			\PRIVATE\10285A82\tkt2409.test
+data=ZPRIVATE\10285A82\tkt2450.test			\PRIVATE\10285A82\tkt2450.test
+data=ZPRIVATE\10285A82\tkt2640.test			\PRIVATE\10285A82\tkt2640.test
+data=ZPRIVATE\10285A82\tkt2643.test			\PRIVATE\10285A82\tkt2643.test
+data=ZPRIVATE\10285A82\tkt2686.test			\PRIVATE\10285A82\tkt2686.test
+data=ZPRIVATE\10285A82\tkt2767.test			\PRIVATE\10285A82\tkt2767.test
+data=ZPRIVATE\10285A82\tkt2817.test			\PRIVATE\10285A82\tkt2817.test
+data=ZPRIVATE\10285A82\tkt2820.test			\PRIVATE\10285A82\tkt2820.test
+data=ZPRIVATE\10285A82\tkt2822.test			\PRIVATE\10285A82\tkt2822.test
+data=ZPRIVATE\10285A82\tkt2832.test			\PRIVATE\10285A82\tkt2832.test
+data=ZPRIVATE\10285A82\tkt2854.test			\PRIVATE\10285A82\tkt2854.test
+data=ZPRIVATE\10285A82\tkt2920.test			\PRIVATE\10285A82\tkt2920.test
+data=ZPRIVATE\10285A82\tkt2927.test			\PRIVATE\10285A82\tkt2927.test
+data=ZPRIVATE\10285A82\tkt2942.test			\PRIVATE\10285A82\tkt2942.test
+data=ZPRIVATE\10285A82\tkt3080.test			\PRIVATE\10285A82\tkt3080.test
+data=ZPRIVATE\10285A82\tkt3093.test			\PRIVATE\10285A82\tkt3093.test
+data=ZPRIVATE\10285A82\tkt3121.test			\PRIVATE\10285A82\tkt3121.test
+data=ZPRIVATE\10285A82\tkt3201.test			\PRIVATE\10285A82\tkt3201.test
+data=ZPRIVATE\10285A82\tokenize.test			\PRIVATE\10285A82\tokenize.test
+data=ZPRIVATE\10285A82\trace.test			\PRIVATE\10285A82\trace.test
+data=ZPRIVATE\10285A82\trans.test			\PRIVATE\10285A82\trans.test
+data=ZPRIVATE\10285A82\trigger1.test			\PRIVATE\10285A82\trigger1.test
+data=ZPRIVATE\10285A82\trigger2.test			\PRIVATE\10285A82\trigger2.test
+data=ZPRIVATE\10285A82\trigger3.test			\PRIVATE\10285A82\trigger3.test
+data=ZPRIVATE\10285A82\trigger4.test			\PRIVATE\10285A82\trigger4.test
+data=ZPRIVATE\10285A82\trigger5.test			\PRIVATE\10285A82\trigger5.test
+data=ZPRIVATE\10285A82\trigger6.test			\PRIVATE\10285A82\trigger6.test
+data=ZPRIVATE\10285A82\trigger7.test			\PRIVATE\10285A82\trigger7.test
+data=ZPRIVATE\10285A82\trigger8.test			\PRIVATE\10285A82\trigger8.test
+data=ZPRIVATE\10285A82\trigger9.test			\PRIVATE\10285A82\trigger9.test
+data=ZPRIVATE\10285A82\triggerA.test			\PRIVATE\10285A82\triggerA.test
+data=ZPRIVATE\10285A82\triggerB.test			\PRIVATE\10285A82\triggerB.test
+data=ZPRIVATE\10285A82\types.test			\PRIVATE\10285A82\types.test
+data=ZPRIVATE\10285A82\types2.test			\PRIVATE\10285A82\types2.test
+data=ZPRIVATE\10285A82\types3.test			\PRIVATE\10285A82\types3.test
+data=ZPRIVATE\10285A82\unique.test			\PRIVATE\10285A82\unique.test
+data=ZPRIVATE\10285A82\update.test			\PRIVATE\10285A82\update.test
+data=ZPRIVATE\10285A82\utf16align.test			\PRIVATE\10285A82\utf16align.test
+data=ZPRIVATE\10285A82\vacuum.test			\PRIVATE\10285A82\vacuum.test
+data=ZPRIVATE\10285A82\vacuum2.test			\PRIVATE\10285A82\vacuum2.test
+data=ZPRIVATE\10285A82\vacuum3.test			\PRIVATE\10285A82\vacuum3.test
+data=ZPRIVATE\10285A82\varint.test			\PRIVATE\10285A82\varint.test
+data=ZPRIVATE\10285A82\veryquick.test			\PRIVATE\10285A82\veryquick.test
+data=ZPRIVATE\10285A82\view.test			\PRIVATE\10285A82\view.test
+data=ZPRIVATE\10285A82\vtab1.test			\PRIVATE\10285A82\vtab1.test
+data=ZPRIVATE\10285A82\vtab2.test			\PRIVATE\10285A82\vtab2.test
+data=ZPRIVATE\10285A82\vtab3.test			\PRIVATE\10285A82\vtab3.test
+data=ZPRIVATE\10285A82\vtab4.test			\PRIVATE\10285A82\vtab4.test
+data=ZPRIVATE\10285A82\vtab5.test			\PRIVATE\10285A82\vtab5.test
+data=ZPRIVATE\10285A82\vtab6.test			\PRIVATE\10285A82\vtab6.test
+data=ZPRIVATE\10285A82\vtab7.test			\PRIVATE\10285A82\vtab7.test
+data=ZPRIVATE\10285A82\vtab8.test			\PRIVATE\10285A82\vtab8.test
+data=ZPRIVATE\10285A82\vtab9.test			\PRIVATE\10285A82\vtab9.test
+data=ZPRIVATE\10285A82\vtabA.test			\PRIVATE\10285A82\vtabA.test
+data=ZPRIVATE\10285A82\vtabB.test			\PRIVATE\10285A82\vtabB.test
+data=ZPRIVATE\10285A82\vtabC.test			\PRIVATE\10285A82\vtabC.test
+data=ZPRIVATE\10285A82\vtab_alter.test			\PRIVATE\10285A82\vtab_alter.test
+data=ZPRIVATE\10285A82\vtab_err.test			\PRIVATE\10285A82\vtab_err.test
+data=ZPRIVATE\10285A82\vtab_shared.test			\PRIVATE\10285A82\vtab_shared.test
+data=ZPRIVATE\10285A82\where.test			\PRIVATE\10285A82\where.test
+data=ZPRIVATE\10285A82\where2.test			\PRIVATE\10285A82\where2.test
+data=ZPRIVATE\10285A82\where3.test			\PRIVATE\10285A82\where3.test
+data=ZPRIVATE\10285A82\where4.test			\PRIVATE\10285A82\where4.test
+data=ZPRIVATE\10285A82\where5.test			\PRIVATE\10285A82\where5.test
+data=ZPRIVATE\10285A82\where6.test			\PRIVATE\10285A82\where6.test
+data=ZPRIVATE\10285A82\zeroblob.test			\PRIVATE\10285A82\zeroblob.test
 
 //The next line to be uncommented if the testing is performed locally. Otherwise tests will fail - 
 //the following file is missing and needed by the timezone server.
-//data=ZPRIVATE\10202be9\1020383e.txt     	\private\10202be9\1020383e.txt
+//data=ZPRIVATE\10202BE9\1020383e.txt     	\PRIVATE\10202be9\1020383e.txt
 
-file=ABI_DIR\BUILD_DIR\t_sqliteapi.exe		\test\t_sqliteapi.exe
-file=ABI_DIR\BUILD_DIR\t_sqlitewsd.exe		\test\t_sqlitewsd.exe
-file=ABI_DIR\BUILD_DIR\t_sqlitewsd2.exe		\test\t_sqlitewsd2.exe
-file=ABI_DIR\BUILD_DIR\t_sqliteperf.exe		\test\t_sqliteperf.exe
-file=ABI_DIR\BUILD_DIR\t_sqliteperf2.exe	\test\t_sqliteperf2.exe
-file=ABI_DIR\BUILD_DIR\tclsqlite3.exe		\test\tclsqlite3.exe
-file=ABI_DIR\BUILD_DIR\t_sqlitedef.exe		\test\t_sqlitedef.exe
-file=ABI_DIR\BUILD_DIR\t_sqlitedb64.exe		\test\t_sqlitedb64.exe
+file=ABI_DIR\BUILD_DIR\t_sqliteapi.exe		\TEST\t_sqliteapi.exe
+file=ABI_DIR\BUILD_DIR\t_sqlitewsd.exe		\TEST\t_sqlitewsd.exe
+file=ABI_DIR\BUILD_DIR\t_sqlitewsd2.exe		\TEST\t_sqlitewsd2.exe
+file=ABI_DIR\BUILD_DIR\t_sqliteperf.exe		\TEST\t_sqliteperf.exe
+file=ABI_DIR\BUILD_DIR\t_sqliteperf2.exe	\TEST\t_sqliteperf2.exe
+file=ABI_DIR\BUILD_DIR\tclsqlite3.exe		\TEST\tclsqlite3.exe
+file=ABI_DIR\BUILD_DIR\t_sqlitedef.exe		\TEST\t_sqlitedef.exe
+file=ABI_DIR\BUILD_DIR\t_sqlitedb64.exe		\TEST\t_sqlitedb64.exe
 
 #endif
--- a/persistentstorage/sqlite3api/GROUP/t_sqliteapi.mmp	Wed Sep 15 14:05:58 2010 +0300
+++ b/persistentstorage/sqlite3api/GROUP/t_sqliteapi.mmp	Wed Oct 13 16:30:44 2010 +0300
@@ -31,7 +31,6 @@
 LIBRARY         sqlite3.lib
 LIBRARY			efsrv.lib
 
-UID		  0 0x212C3129
 VENDORID 0x70000001
 
 SMPSAFE
--- a/persistentstorage/sqlite3api/TEST/TclScript/all.test	Wed Sep 15 14:05:58 2010 +0300
+++ b/persistentstorage/sqlite3api/TEST/TclScript/all.test	Wed Oct 13 16:30:44 2010 +0300
@@ -1,6 +1,6 @@
 # 2001 September 15
 #
-# Portions Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiaries. All rights reserved.
+# Portions Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiaries. All rights reserved.
 #
 # The author disclaims copyright to this source code.  In place of
 # a legal notice, here is a blessing:
@@ -75,7 +75,7 @@
 lappend EXCLUDE fuzz3.test
 lappend EXCLUDE soak.test              ;# Takes a very long time (default 1 hr)
 lappend EXCLUDE fts3.test              ;# Wrapper for muliple fts3*.tests
-lappend EXCLUDE mallocall.test         ;# Wrapper for running all malloc tests
+lappend EXCLUDE mallocAll.test         ;# Wrapper for running all malloc tests
 lappend EXCLUDE speed1.test			   ;# Symbian OS: Excluding all "speed" tests, the first one is crashing all.test.
 lappend EXCLUDE speed1p.test		   ;# Also, these "speed" tests are not that useful for Symbian OS.
 lappend EXCLUDE speed2.test
--- a/persistentstorage/sqlite3api/TEST/t_sqliteapi.c	Wed Sep 15 14:05:58 2010 +0300
+++ b/persistentstorage/sqlite3api/TEST/t_sqliteapi.c	Wed Oct 13 16:30:44 2010 +0300
@@ -942,8 +942,6 @@
 			}
 		}
 	
-	srand((unsigned)&ThreadFunc);
-	
 	PrintS("Thread \"%s\" - begin\r\n", (char*)pname);
 	err = sqlite3_open(TheTestDbName, &db);
 	TEST2(err, SQLITE_OK);
@@ -951,10 +949,6 @@
 	
 	while(records < KRecordsCount)
 		{
-        if((records % 10) == 0)
-            {
-            PrintSI("Thread \"%s\", %d records.\r\n", (char*)pname, records);
-            }
 		err = sqlite3_exec(db, "BEGIN", 0, 0, &errmsg);
 		if(err == SQLITE_OK)
 			{
@@ -972,7 +966,7 @@
 		if(err == SQLITE_OK)
 			{
 			TheInsertRecCnt[threadIdx]	+= KCommitRecordsCount;
-			records += KCommitRecordsCount;
+			records += 2;
 			}
 		else if(err == SQLITE_BUSY)
 			{
@@ -980,15 +974,11 @@
 			(void)sqlite3_exec(db, "ROLLBACK", 0, 0, 0);
 			if(errmsg)
 				{
-                char fmt[100];
-                strcpy(fmt, "Thread \"");
-                strcat(fmt, (char*)pname);
-                strcat(fmt, "\". Err msg: %s. Err: %d.\r\n");
-				PrintSI(fmt, errmsg, err);
+				PrintSI("Err msg: %s. Err: %d.\r\n", errmsg, err);
 				sqlite3_free(errmsg);
 				errmsg = 0;
 				}
-			usleep((rand() % 3000) + 500);
+			usleep(100);
 			}
 		}
 
--- a/persistentstorage/sqlite3api/TEST/t_sqliteapi.txt	Wed Sep 15 14:05:58 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-This file is not used by any of the SQLite tests.
-The only purpose of this file is: to create a private branch
-on Z: drive for t_sqliteapi test and copy the file there.
--- a/persistentstorage/store/INC/S32FILE.INL	Wed Sep 15 14:05:58 2010 +0300
+++ b/persistentstorage/store/INC/S32FILE.INL	Wed Oct 13 16:30:44 2010 +0300
@@ -296,7 +296,6 @@
 	{
 //  When the file server write caching is enabled, the order of file write operations is not guaranteed. This could cause data inconsistency in some circumstances,
 //  for example, when the power is lost in the middle of a database transaction. Therefore, the file write caching is disabled for this file to maintain integrity.
-	
     if ((aFileMode&EFileWrite) != 0)
         {
         aFileMode |= EFileWriteDirectIO;
--- a/persistentstorage/store/ROM/StoreTests.IBY	Wed Sep 15 14:05:58 2010 +0300
+++ b/persistentstorage/store/ROM/StoreTests.IBY	Wed Oct 13 16:30:44 2010 +0300
@@ -23,33 +23,33 @@
 #include "pbe.iby"
 
 // batch file that runs all automatic store tests
-data=DATAZ_\test\storetests.bat	test\storetests.bat
+data=DATAZ_\test\StoreTests.bat	Test\StoreTests.bat
 
-file=ABI_DIR\BUILD_DIR\t_storset.exe        test\t_storset.exe
-file=ABI_DIR\BUILD_DIR\t_storcrypt.exe      test\t_storcrypt.exe
-file=ABI_DIR\BUILD_DIR\t_storcorrupt.exe    test\t_storcorrupt.exe
-file=ABI_DIR\BUILD_DIR\t_storfbuf.exe       test\t_storfbuf.exe
-file=ABI_DIR\BUILD_DIR\t_storfcomp.exe      test\t_storfcomp.exe
-file=ABI_DIR\BUILD_DIR\t_storfdir.exe       test\t_storfdir.exe
-file=ABI_DIR\BUILD_DIR\t_storfperm.exe      test\t_storfperm.exe
-file=ABI_DIR\BUILD_DIR\t_storfrecl.exe      test\t_storfrecl.exe
-file=ABI_DIR\BUILD_DIR\t_storfserr.exe      test\t_storfserr.exe
-file=ABI_DIR\BUILD_DIR\t_storfstrm.exe      test\t_storfstrm.exe
-file=ABI_DIR\BUILD_DIR\t_storoom.exe        test\t_storoom.exe	
-file=ABI_DIR\BUILD_DIR\t_stormemstrm.exe    test\t_stormemstrm.exe
-file=ABI_DIR\BUILD_DIR\t_storpage.exe       test\t_storpage.exe	
-file=ABI_DIR\BUILD_DIR\t_stordelim.exe      test\t_stordelim.exe
-file=ABI_DIR\BUILD_DIR\t_stordictfs.exe     test\t_stordictfs.exe
-file=ABI_DIR\BUILD_DIR\t_storembed.exe      test\t_storembed.exe
-file=ABI_DIR\BUILD_DIR\t_storshape.exe      test\t_storshape.exe
-file=ABI_DIR\BUILD_DIR\t_stordict.exe       test\t_stordict.exe
-file=ABI_DIR\BUILD_DIR\t_storstrm.exe       test\t_storstrm.exe	
-file=ABI_DIR\BUILD_DIR\t_storconv.exe       test\t_storconv.exe
-file=ABI_DIR\BUILD_DIR\t_storucmp.exe       test\t_storucmp.exe
-file=ABI_DIR\BUILD_DIR\t_storstreamperf.exe test\t_storstreamperf.exe
-file=ABI_DIR\BUILD_DIR\t_storiter.exe       test\t_storiter.exe
-file=ABI_DIR\BUILD_DIR\t_stortoc.exe        test\t_stortoc.exe
-file=ABI_DIR\BUILD_DIR\t_storverify.exe     test\t_storverify.exe
-file=ABI_DIR\BUILD_DIR\t_storbench.exe      test\t_storbench.exe
+file=ABI_DIR\BUILD_DIR\t_storset.exe	Test\t_storset.exe
+file=ABI_DIR\BUILD_DIR\t_storcrypt.exe	Test\t_storcrypt.exe
+file=ABI_DIR\BUILD_DIR\t_storcorrupt.exe	Test\t_storcorrupt.exe
+file=ABI_DIR\BUILD_DIR\t_storfbuf.exe	Test\t_storfbuf.exe
+file=ABI_DIR\BUILD_DIR\t_storfcomp.exe	Test\t_storfcomp.exe
+file=ABI_DIR\BUILD_DIR\t_storfdir.exe	Test\t_storfdir.exe
+file=ABI_DIR\BUILD_DIR\t_storfperm.exe	Test\t_storfperm.exe
+file=ABI_DIR\BUILD_DIR\t_storfrecl.exe	Test\t_storfrecl.exe
+file=ABI_DIR\BUILD_DIR\t_storfserr.exe	Test\t_storfserr.exe
+file=ABI_DIR\BUILD_DIR\t_storfstrm.exe	Test\t_storfstrm.exe
+file=ABI_DIR\BUILD_DIR\t_storoom.exe	Test\t_storoom.exe	
+file=ABI_DIR\BUILD_DIR\t_stormemstrm.exe	Test\t_stormemstrm.exe
+file=ABI_DIR\BUILD_DIR\t_storpage.exe	Test\t_storpage.exe	
+file=ABI_DIR\BUILD_DIR\t_stordelim.exe	Test\t_stordelim.exe
+file=ABI_DIR\BUILD_DIR\t_stordictfs.exe	Test\t_stordictfs.exe
+file=ABI_DIR\BUILD_DIR\t_storembed.exe	Test\t_storembed.exe
+file=ABI_DIR\BUILD_DIR\t_storshape.exe	Test\t_storshape.exe
+file=ABI_DIR\BUILD_DIR\t_stordict.exe	Test\t_stordict.exe
+file=ABI_DIR\BUILD_DIR\t_storstrm.exe	Test\t_storstrm.exe	
+file=ABI_DIR\BUILD_DIR\t_storconv.exe	Test\t_storconv.exe
+file=ABI_DIR\BUILD_DIR\t_storucmp.exe	Test\t_storucmp.exe
+file=ABI_DIR\BUILD_DIR\t_storstreamperf.exe Test\t_storstreamperf.exe
+file=ABI_DIR\BUILD_DIR\t_storiter.exe	Test\t_storiter.exe
+file=ABI_DIR\BUILD_DIR\t_stortoc.exe	Test\t_stortoc.exe
+file=ABI_DIR\BUILD_DIR\t_storverify.exe	Test\t_storverify.exe
+file=ABI_DIR\BUILD_DIR\t_storbench.exe	Test\T_storbench.exe
 #endif
 
--- a/traceservices/tracefw/ulogger/src/sysconfig/configfilemanager.cpp	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/src/sysconfig/configfilemanager.cpp	Wed Oct 13 16:30:44 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -107,14 +107,12 @@
 	TInt error= fs.MkDir(fileName);
 	if(error==KErrNone || error== KErrAlreadyExists)
 		{
-        CleanupClosePushL(fs);
 		CFileMan* fMan = CFileMan::NewL(fs);
 		CleanupStack::PushL(fMan);
 		fileName.Append(KConfigFilename);
 		User::LeaveIfError(fMan->Copy(KDefaultConfigFilePath, fileName, CFileMan::EOverWrite) );
 		CleanupStack::PopAndDestroy(fMan);
 		User::LeaveIfError(fs.SetAtt(fileName,0, KEntryAttReadOnly));
-		CleanupStack::Pop(&fs);
 		}
 	fs.Close();
 	aFilePath.Zero();
--- a/traceservices/tracefw/ulogger/src/uloggerserver/uloggerserver.cpp	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/src/uloggerserver/uloggerserver.cpp	Wed Oct 13 16:30:44 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -33,18 +33,6 @@
 namespace Ulogger {
 
 
-void CleanupPointerArray( TAny* aArray )
-    {
-    static_cast< RPointerArray< TPluginConfiguration >* >( aArray )->ResetAndDestroy();
-    static_cast< RPointerArray< TPluginConfiguration >* >( aArray )->Close();
-    }
-
-void CleanupResetAndDestroyPushL( RPointerArray< TPluginConfiguration >& aArray )
-    {
-    TCleanupItem item( CleanupPointerArray, &aArray );
-    CleanupStack::PushL( item );
-    }
-
 /*Default constructor*/
 CULoggerServer::CULoggerServer(TInt aPriority)
 : CServer2( aPriority )
@@ -1160,23 +1148,20 @@
 		}
 	}
 
+
 void CULoggerServer::InitializeFrameworksL()
 	{
 	//<create plugin allocator (plugins)>
 	//output settings
 	RBuf8 outPluginName;
 	outPluginName.Create(KMaxPluginName);
-	outPluginName.CleanupClosePushL();
 	RPointerArray<TPluginConfiguration> outputPluginSettings;
-	CleanupResetAndDestroyPushL(outputPluginSettings);
 	GetPluginAndSettingsL(outPluginName, &outputPluginSettings, EOutputPluginFilter);
 
 	//control settings
 	RBuf8 inputPluginName;
 	inputPluginName.Create(KMaxPluginName);
-	inputPluginName.CleanupClosePushL();
 	RPointerArray<TPluginConfiguration> inputPluginSettings;
-	CleanupResetAndDestroyPushL(inputPluginSettings);
 	this->GetPluginAndSettingsL(inputPluginName, &inputPluginSettings, EInputPluginFilter);
 
 	#if defined(__LIGHTLOGGER_ENABLED) && defined(__VERBOSE_MODE)
@@ -1199,8 +1184,14 @@
 		iInputFramework = CInputFramework::NewL(iPluginAllocator->GetInputPlugin(), inputPluginSettings, this);
 
 	//cleanup
-	CleanupStack::PopAndDestroy(4,&outPluginName);
-	iDataWatcher = CULoggerWatcher::NewL();
+	outPluginName.Close();
+	outputPluginSettings.ResetAndDestroy();
+	outputPluginSettings.Close();
+	inputPluginName.Close();
+	inputPluginSettings.ResetAndDestroy();
+	inputPluginSettings.Close();
+
+	iDataWatcher = CULoggerWatcher::NewL();	
 	}
 
 
--- a/traceservices/tracefw/ulogger/unit_test/group/bld.inf	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/group/bld.inf	Wed Oct 13 16:30:44 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -25,45 +25,45 @@
 
 //te_outfrwk files
 te_outfrwk.iby		/epoc32/rom/include/te_outfrwk.iby
-../scripts/te_outfrwk.script      z:/testdata/scripts/te_outfrwk.script
+../scripts/te_outfrwk.script      /epoc32/release/winscw/udeb/z/testdata/scripts/te_outfrwk.script
 
 
 //te_sysconfig
 te_sysconfig.iby		/epoc32/rom/include/te_sysconfig.iby
-../scripts/te_sysconfig.script      z:/testdata/scripts/te_sysconfig.script
+../scripts/te_sysconfig.script      /epoc32/release/winscw/udeb/z/testdata/scripts/te_sysconfig.script
 
 
 //te_outfrwkchans/te_file
 te_file.iby /epoc32/rom/include/te_file.iby
-../scripts/te_file.script z:/testdata/scripts/te_file.script
+../scripts/te_file.script /epoc32/release/winscw/udeb/z/testdata/scripts/te_file.script
 
 //te_outfrwkchans/te_serial
 te_serial.iby /epoc32/rom/include/te_serial.iby
-../scripts/te_serial.script z:/testdata/scripts/te_serial.script
+../scripts/te_serial.script /epoc32/release/winscw/udeb/z/testdata/scripts/te_serial.script
 
 //te_server
 te_server.iby   	/epoc32/rom/include/te_server.iby
-../scripts/te_server.script z:/testdata/scripts/te_server.script
+../scripts/te_server.script /epoc32/release/winscw/udeb/z/testdata/scripts/te_server.script
 
 //te_client
 te_client.iby   		/epoc32/rom/include/te_client.iby
-../scripts/te_client.script z:/testdata/scripts/te_client.script
+../scripts/te_client.script /epoc32/release/winscw/udeb/z/testdata/scripts/te_client.script
 
 
 //to run all script files at once.
 te_unittestsuite.iby   			/epoc32/rom/include/te_unittestsuite.iby
-../scripts/te_unittestsuite.script z:/testdata/scripts/te_unittestsuite.script
+../scripts/te_unittestsuite.script /epoc32/release/winscw/udeb/z/testdata/scripts/te_unittestsuite.script
 
 //to run automated script files at once
 te_automatedsuite.iby   			/epoc32/rom/include/te_automatedsuite.iby
-../scripts/te_automatedsuite.script z:/testdata/scripts/te_automatedsuite.script
+../scripts/te_automatedsuite.script /epoc32/release/winscw/udeb/z/testdata/scripts/te_automatedsuite.script
 
 //te_createconfig
 te_createconfig.iby  	/epoc32/rom/include/te_createconfig.iby
 
 //te_sysstart
 te_sysstart.iby   			/epoc32/rom/include/te_sysstart.iby
-../scripts/te_sysstart.script z:/testdata/scripts/te_sysstart.script
+../scripts/te_sysstart.script /epoc32/release/winscw/udeb/z/testdata/scripts/te_sysstart.script
 
 PRJ_TESTMMPFILES
 te_outfrwk.mmp
--- a/traceservices/tracefw/ulogger/unit_test/group/te_client.mmp	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/group/te_client.mmp	Wed Oct 13 16:30:44 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -43,7 +43,8 @@
 
 USERINCLUDE   ../../inc
 
-OS_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE /epoc32/include
+SYSTEMINCLUDE /epoc32/include/test
 
 //Please add your system include under here. 
 
--- a/traceservices/tracefw/ulogger/unit_test/group/te_createconfig.mmp	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/group/te_createconfig.mmp	Wed Oct 13 16:30:44 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -28,7 +28,8 @@
 SOURCE         	te_createconfigfullstep.cpp
 USERINCLUDE   	../../inc
 
-OS_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE /epoc32/include
+SYSTEMINCLUDE /epoc32/include/test
 
 //Please add your system include under here. 
 
--- a/traceservices/tracefw/ulogger/unit_test/group/te_file.mmp	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/group/te_file.mmp	Wed Oct 13 16:30:44 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -24,7 +24,10 @@
 //---------------------------------------
 // Specific files for TEFUnit
 //---------------------------------------
-OS_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE	/epoc32/include
+SYSTEMINCLUDE	/epoc32/include/test
+SYSTEMINCLUDE	/epoc32/include/libc
+SYSTEMINCLUDE	/epoc32/include/ecom
 
 USERINCLUDE ../te-outfrwkchans/te-file
 USERINCLUDE ../../inc
--- a/traceservices/tracefw/ulogger/unit_test/group/te_outfrwk.mmp	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/group/te_outfrwk.mmp	Wed Oct 13 16:30:44 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -34,7 +34,9 @@
 USERINCLUDE		../../inc
 
 USERINCLUDE		../../src/pluginframework
-OS_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE	/epoc32/include
+SYSTEMINCLUDE	/epoc32/include/test
+SYSTEMINCLUDE	/epoc32/include/ecom
 
 LIBRARY		bafl.lib
 LIBRARY		euser.lib
--- a/traceservices/tracefw/ulogger/unit_test/group/te_serial.mmp	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/group/te_serial.mmp	Wed Oct 13 16:30:44 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -24,7 +24,10 @@
 //---------------------------------------
 // Specific files for TEFUnit
 //---------------------------------------
-OS_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE	/epoc32/include
+SYSTEMINCLUDE	/epoc32/include/test
+SYSTEMINCLUDE	/epoc32/include/libc
+SYSTEMINCLUDE	/epoc32/include/ecom
 
 USERINCLUDE ../te-outfrwkchans/te-serial
 USERINCLUDE ../../inc
--- a/traceservices/tracefw/ulogger/unit_test/group/te_server.mmp	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/group/te_server.mmp	Wed Oct 13 16:30:44 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -57,7 +57,9 @@
 USERINCLUDE  ../../src/pluginframework
 USERINCLUDE   ../../src/uloggerserver
 
-OS_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE /epoc32/include
+SYSTEMINCLUDE /epoc32/include/test
+SYSTEMINCLUDE /epoc32/include/ecom
 
 
 
--- a/traceservices/tracefw/ulogger/unit_test/group/te_sysconfig.mmp	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/group/te_sysconfig.mmp	Wed Oct 13 16:30:44 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -40,8 +40,9 @@
 userinclude	../../src/sysconfig
 userinclude	../../inc
 userinclude	../../src/pluginframework
-
-OS_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE	/epoc32/include
+SYSTEMINCLUDE	/epoc32/include/ecom
+SYSTEMINCLUDE	/epoc32/include/test
 
 LIBRARY		euser.lib
 LIBRARY		testexecutelogclient.lib
--- a/traceservices/tracefw/ulogger/unit_test/group/te_sysstart.mmp	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/group/te_sysstart.mmp	Wed Oct 13 16:30:44 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -21,7 +21,10 @@
 VENDORID 	0x70000001
 MACRO __ULOGGER_SYSTEMSTART_UNIT_TEST
 
-OS_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE	/epoc32/include
+SYSTEMINCLUDE	/epoc32/include/test
+
+
 
 USERINCLUDE ../te-sysstart
 USERINCLUDE ../../inc
--- a/traceservices/tracefw/ulogger/unit_test/te-client/te_uloggerclientsuiteserver.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/te_uloggerclientsuiteserver.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -24,7 +24,7 @@
 
 #if (!defined __TE_ULOGGERCLIENT_SERVER_H__)
 #define __TE_ULOGGERCLIENT_SERVER_H__
-#include <test/testexecuteserverbase.h>
+#include <testexecuteserverbase.h>
 
 
 class CTestUloggerClientApi : public CTestServer
--- a/traceservices/tracefw/ulogger/unit_test/te-client/te_uloggerclientsuitestepbase.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/te_uloggerclientsuitestepbase.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -24,7 +24,7 @@
 
 #if (!defined __TE_ULOGGERCLIENT_STEP_BASE__)
 #define __TE_ULOGGERCLIENT_STEP_BASE__
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 
 #include "uloggerclient.h"
 
--- a/traceservices/tracefw/ulogger/unit_test/te-client/testconnectstep.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/testconnectstep.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -23,7 +23,7 @@
 */
 #if (!defined __TESTCONNECT_STEP_H__)
 #define __TESTCONNECT_STEP_H__
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 
 class CTestConnectStep : public CTestUloggerClientApiStepBase
--- a/traceservices/tracefw/ulogger/unit_test/te-client/testdeactivateoutputpluginstep.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/testdeactivateoutputpluginstep.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -23,7 +23,7 @@
 */
 #if (!defined __TESTDEACTIVATEOUTPUTPLUGIN_STEP_H__)
 #define __TESTDEACTIVATEOUTPUTPLUGIN_STEP_H__
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 
 class CTestDeactivateOutputPluginStep : public CTestUloggerClientApiStepBase
--- a/traceservices/tracefw/ulogger/unit_test/te-client/testgetprimaryfilterslstep.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/testgetprimaryfilterslstep.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -23,7 +23,7 @@
 */
 #if (!defined __TESTGETPRIMARYFILTERSL_STEP_H__)
 #define __TESTGETPRIMARYFILTERSL_STEP_H__
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 
 class CTestGetPrimaryFiltersLStep : public CTestUloggerClientApiStepBase
--- a/traceservices/tracefw/ulogger/unit_test/te-client/testgetsecondaryfilterslstep.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/testgetsecondaryfilterslstep.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -23,7 +23,7 @@
 */
 #if (!defined __TESTGETSECONDARYFILTERSL_STEP_H__)
 #define __TESTGETSECONDARYFILTERSL_STEP_H__
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 
 class CTestGetSecondaryFiltersLStep : public CTestUloggerClientApiStepBase
--- a/traceservices/tracefw/ulogger/unit_test/te-client/testgettracebuffersizestep.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/testgettracebuffersizestep.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -23,7 +23,7 @@
 */
 #if (!defined __TESTGETTRACEBUFFERSIZE_STEP_H__)
 #define __TESTGETTRACEBUFFERSIZE_STEP_H__
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 
 class CTestGetTraceBufferSizeStep : public CTestUloggerClientApiStepBase
--- a/traceservices/tracefw/ulogger/unit_test/te-client/testremoveprimaryfltstep.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/testremoveprimaryfltstep.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -23,7 +23,7 @@
 */
 #if (!defined __TESTREMOVEPRIMARYFLT_STEP_H__)
 #define __TESTREMOVEPRIMARYFLT_STEP_H__
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 
 
--- a/traceservices/tracefw/ulogger/unit_test/te-client/testresizetracebuffersizestep.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/testresizetracebuffersizestep.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -23,7 +23,7 @@
 */
 #if (!defined __TESTRESIZETRACEBUFFERSIZE_STEP_H__)
 #define __TESTRESIZETRACEBUFFERSIZE_STEP_H__
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 
 class CTestResizeTraceBufferSizeStep : public CTestUloggerClientApiStepBase
--- a/traceservices/tracefw/ulogger/unit_test/te-client/testruloggerapi_ext.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/testruloggerapi_ext.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -23,7 +23,7 @@
 */
 #if (!defined __TESTRULOGGERAPI_EXT_H__)
 #define __TESTRULOGGERAPI_EXT_H__
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 #include <uloggerclient.h>
 using namespace Ulogger;
--- a/traceservices/tracefw/ulogger/unit_test/te-client/testsetdatanotificationsizestep.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/testsetdatanotificationsizestep.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -23,7 +23,7 @@
 */
 #if (!defined __TESTSETDATANOTIFICATIONSIZE_STEP_H__)
 #define __TESTSETDATANOTIFICATIONSIZE_STEP_H__
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 
 class CTestSetDataNotificationSizeStep : public CTestUloggerClientApiStepBase
--- a/traceservices/tracefw/ulogger/unit_test/te-client/testsetprimaryfltstep.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/testsetprimaryfltstep.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -24,7 +24,7 @@
 #if (!defined __TESTSETPRIMARYFLT_STEP_H__)
 #define __TESTSETPRIMARYFLT_STEP_H__
 
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 
 class CTestSetPrimaryFltStep : public CTestUloggerClientApiStepBase
--- a/traceservices/tracefw/ulogger/unit_test/te-client/testsetsecondaryfilterallstep.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/testsetsecondaryfilterallstep.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -23,7 +23,7 @@
 */
 #if (!defined __TESTSETSECONDARYFILTERALL_STEP_H__)
 #define __TESTSETSECONDARYFILTERALL_STEP_H__
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 
 class CTestSetSecondaryFilterAllStep : public CTestUloggerClientApiStepBase
--- a/traceservices/tracefw/ulogger/unit_test/te-client/testsetsecondaryfltstep.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/testsetsecondaryfltstep.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -23,7 +23,7 @@
 */
 #if (!defined __TESTSETSECONDARYFLT_STEP_H__)
 #define __TESTSETSECONDARYFLT_STEP_H__
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 
 class CTestSetSecondaryFltStep : public CTestUloggerClientApiStepBase
--- a/traceservices/tracefw/ulogger/unit_test/te-client/teststartstep.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/teststartstep.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -23,7 +23,7 @@
 */
 #if (!defined __TESTSTART_STEP_H__)
 #define __TESTSTART_STEP_H__
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 
 class CTestStartStep : public CTestUloggerClientApiStepBase
--- a/traceservices/tracefw/ulogger/unit_test/te-client/teststopstep.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/teststopstep.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -23,7 +23,7 @@
 */
 #if (!defined __TESTSTOP_STEP_H__)
 #define __TESTSTOP_STEP_H__
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 
 class CTestStopStep : public CTestUloggerClientApiStepBase
--- a/traceservices/tracefw/ulogger/unit_test/te-client/testtracebuffermodestep.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/testtracebuffermodestep.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -23,7 +23,7 @@
 */
 #if (!defined __TESTRESIZETRACEBUFFERSIZE_STEP_H__)
 #define __TESTRESIZETRACEBUFFERSIZE_STEP_H__
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 
 class CTestTraceBufferModeStep : public CTestUloggerClientApiStepBase
--- a/traceservices/tracefw/ulogger/unit_test/te-client/testversionstep.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-client/testversionstep.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -23,7 +23,7 @@
 */
 #if (!defined __TESTVERSION_STEP_H__)
 #define __TESTVERSION_STEP_H__
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 #include "te_uloggerclientsuitestepbase.h"
 
 class CTestVersionStep : public CTestUloggerClientApiStepBase
--- a/traceservices/tracefw/ulogger/unit_test/te-createconfig/te_createconfigemptystep.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-createconfig/te_createconfigemptystep.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -25,7 +25,7 @@
 #ifndef TE_CREATECONFIGEMPTYSTEP_H
 #define TE_CREATECONFIGEMPTYSTEP_H
 
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 
 //Test Sysconfig of Ulogger
 class CCreateConfigEmptyTestStep : public CTestStep
--- a/traceservices/tracefw/ulogger/unit_test/te-createconfig/te_createconfigfullstep.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-createconfig/te_createconfigfullstep.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -25,7 +25,7 @@
 #ifndef TE_CREATECONFIGFULLSTEP_H
 #define TE_CREATECONFIGFULLSTEP_H
 
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 
 //Test Sysconfig of Ulogger
 class CCreateConfigFUllTestStep : public CTestStep
--- a/traceservices/tracefw/ulogger/unit_test/te-createconfig/te_createconfigserver.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-createconfig/te_createconfigserver.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -16,7 +16,7 @@
 #ifndef TE_CREATECONFIG_SERVER_H
 #define TE_CREATECONFIG_SERVER_H
 
-#include<test/testexecuteserverbase.h>
+#include<testexecuteserverbase.h>
 
 /*
  * Derived class of the CTestServer
--- a/traceservices/tracefw/ulogger/unit_test/te-outfrwk/te_outfrwk_testserver.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-outfrwk/te_outfrwk_testserver.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -16,7 +16,7 @@
 #ifndef T_OUTFRWK_SERVER_H
 #define T_OUTFRWK_SERVER_H
 
-#include<test/testexecuteserverbase.h>
+#include<testexecuteserverbase.h>
 
 /*
  * Derived class of the CTestServer
--- a/traceservices/tracefw/ulogger/unit_test/te-outfrwk/te_outfrwk_teststep.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-outfrwk/te_outfrwk_teststep.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -23,7 +23,7 @@
 #ifndef T_OUTFRWK_TESTSTEP_H
 #define T_OUTFRWK_TESTSTEP_H
 
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 #include <e32base.h> // CBase
 #include <e32test.h>
 #include <f32file.h> // RFs, RFile
--- a/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-file/te_filesuiteserver.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-file/te_filesuiteserver.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -24,7 +24,7 @@
 
 #if (!defined __TE_FILE_SERVER_H__)
 #define __TE_FILE_SERVER_H__
-#include <test/testexecuteserverbase.h>
+#include <testexecuteserverbase.h>
 
 
 class CTe_fileSuite : public CTestServer
--- a/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-file/te_filesuitestepbase.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-file/te_filesuitestepbase.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -24,7 +24,7 @@
 
 #if (!defined __TE_FILE_STEP_BASE__)
 #define __TE_FILE_STEP_BASE__
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 #include <uloggerclient.h>
 using namespace Ulogger;
 
--- a/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-file/uloggerfileplugintest.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-file/uloggerfileplugintest.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -20,7 +20,7 @@
 #ifndef __ULOGGERFILEPLUGINTEST_H__
 #define __ULOGGERFILEPLUGINTEST_H__
 
-#include <test/tefunit.h>
+#include <tefunit.h>
 #include "uloggerfileplugin.h"
 #include "te_filesuitestepbase.h"
 
--- a/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-serial/te_serialsuiteserver.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-serial/te_serialsuiteserver.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -24,7 +24,7 @@
 
 #if (!defined __TE_SERIAL_SERVER_H__)
 #define __TE_SERIAL_SERVER_H__
-#include <test/testexecuteserverbase.h>
+#include <testexecuteserverbase.h>
 
 
 class CTe_serialSuite : public CTestServer
--- a/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-serial/te_serialsuitestepbase.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-serial/te_serialsuitestepbase.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -24,7 +24,7 @@
 
 #if (!defined __TE_SERIAL_STEP_BASE__)
 #define __TE_SERIAL_STEP_BASE__
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 #include <uloggerclient.h>
 using namespace Ulogger;
 
--- a/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-serial/uloggerserialplugintest.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-outfrwkchans/te-serial/uloggerserialplugintest.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -22,7 +22,7 @@
 #ifndef __ULOGGERSERIALPLUGINTEST_H__
 #define __ULOGGERSERIALPLUGINTEST_H__
 
-#include <test/tefunit.h>
+#include <tefunit.h>
 #include "uloggerserialplugin.h"
 #include "te_serialsuitestepbase.h"
 	
--- a/traceservices/tracefw/ulogger/unit_test/te-server/te_uloggerservertestsuiteserver.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-server/te_uloggerservertestsuiteserver.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -24,7 +24,7 @@
 
 #if (!defined __TE_ULOGGERSERVERTEST_SERVER_H__)
 #define __TE_ULOGGERSERVERTEST_SERVER_H__
-#include <test/testexecuteserverbase.h>
+#include <testexecuteserverbase.h>
 
 
 class CTe_UloggerServerTestSuite : public CTestServer
--- a/traceservices/tracefw/ulogger/unit_test/te-server/te_uloggerservertestsuitestepbase.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-server/te_uloggerservertestsuitestepbase.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -24,7 +24,7 @@
 
 #if (!defined __TE_ULOGGERSERVERTEST_STEP_BASE__)
 #define __TE_ULOGGERSERVERTEST_STEP_BASE__
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 // Please add your include here if you have 
 
 /****************************************************************************
--- a/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest0step.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest0step.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -23,7 +23,7 @@
 */
 #if (!defined __ULOGGERSERVERTEST0_STEP_H__)
 #define __ULOGGERSERVERTEST0_STEP_H__
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 #include "te_uloggerservertestsuitestepbase.h"
 #include "uloggerwatcher.h"
 
--- a/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest1step.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest1step.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -23,7 +23,7 @@
 */
 #if (!defined __ULOGGERSERVERTEST1_STEP_H__)
 #define __ULOGGERSERVERTEST1_STEP_H__
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 #include "te_uloggerservertestsuitestepbase.h"
 
 
--- a/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest2step.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest2step.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -23,7 +23,7 @@
 */
 #if (!defined __ULOGGERSERVERTEST2_STEP_H__)
 #define __ULOGGERSERVERTEST2_STEP_H__
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 #include "te_uloggerservertestsuitestepbase.h"
 
 class CUloggerServerTest2Step : public CTe_UloggerServerTestSuiteStepBase
--- a/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest3step.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest3step.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -23,7 +23,7 @@
 */
 #if (!defined __ULOGGERSERVERTEST3_STEP_H__)
 #define __ULOGGERSERVERTEST3_STEP_H__
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 #include "te_uloggerservertestsuitestepbase.h"
 #include "uloggerwatcher.h"
 
--- a/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest4step.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest4step.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -23,7 +23,7 @@
 */
 #if (!defined __ULOGGERSERVERTEST4_STEP_H__)
 #define __ULOGGERSERVERTEST4_STEP_H__
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 #include "te_uloggerservertestsuitestepbase.h"
 #include "pluginallocator.h"
 #include "inputframework.h"
--- a/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest5step.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest5step.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -24,7 +24,7 @@
 
 #if (!defined __ULOGGERSERVERTEST5_STEP_H__)
 #define __ULOGGERSERVERTEST5_STEP_H__
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 #include "te_uloggerservertestsuitestepbase.h"
 
 
--- a/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest6step.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-server/uloggerservertest6step.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -23,7 +23,7 @@
 */
 #if (!defined __ULOGGERSERVERTEST6_STEP_H__)
 #define __ULOGGERSERVERTEST6_STEP_H__
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 #include "te_uloggerservertestsuitestepbase.h"
 #include "inputdata.h"
 
--- a/traceservices/tracefw/ulogger/unit_test/te-sysconfig/te_test_syscfgserver.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-sysconfig/te_test_syscfgserver.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -16,7 +16,7 @@
 #ifndef TE_SYSCFG_SERVER_H
 #define TE_SYSCFG_SERVER_H
 
-#include<test/testexecuteserverbase.h>
+#include<testexecuteserverbase.h>
 
 /*
  * Derived class of the CTestServer
--- a/traceservices/tracefw/ulogger/unit_test/te-sysconfig/te_test_syscfgstep.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-sysconfig/te_test_syscfgstep.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -24,7 +24,7 @@
 #ifndef TE_SYSCFG_TESTSTEP_H
 #define TE_SYSCFG_TESTSTEP_H
 
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 #include <e32base.h> // cbase
 #include <e32test.h>
 #include <f32file.h> // rfs, rfile
--- a/traceservices/tracefw/ulogger/unit_test/te-sysstart/te_sysstartersuiteserver.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-sysstart/te_sysstartersuiteserver.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -24,7 +24,7 @@
 
 #if (!defined __TE_SYSSTARTER_SERVER_H__)
 #define __TE_SYSSTARTER_SERVER_H__
-#include <test/testexecuteserverbase.h>
+#include <testexecuteserverbase.h>
 
 
 class CTe_sysstartSuite : public CTestServer
--- a/traceservices/tracefw/ulogger/unit_test/te-sysstart/te_sysstartersuitestepbase.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-sysstart/te_sysstartersuitestepbase.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -24,7 +24,7 @@
 
 #if (!defined __TE_SYSSTART_STEP_BASE__)
 #define __TE_SYSSTART_STEP_BASE__
-#include <test/testexecutestepbase.h>
+#include <testexecutestepbase.h>
 #include <uloggerclient.h>
 using namespace Ulogger;
 
--- a/traceservices/tracefw/ulogger/unit_test/te-sysstart/uloggersysstarttest.h	Wed Sep 15 14:05:58 2010 +0300
+++ b/traceservices/tracefw/ulogger/unit_test/te-sysstart/uloggersysstarttest.h	Wed Oct 13 16:30:44 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -20,7 +20,7 @@
 #ifndef __ULOGGERSYSSTARTTEST_H__
 #define __ULOGGERSYSSTARTTEST_H__
 
-#include <test/tefunit.h>
+#include <tefunit.h>
 #include "uloggersysstarter.h"
 #include "te_sysstartersuitestepbase.h"