diff -r 63532cdadd44 -r 0d6db0a14001 persistentstorage/sql/TEST/testexecute/SQLite/src/cdtest.cpp --- a/persistentstorage/sql/TEST/testexecute/SQLite/src/cdtest.cpp Fri Jun 11 15:29:22 2010 +0300 +++ b/persistentstorage/sql/TEST/testexecute/SQLite/src/cdtest.cpp Tue Jul 06 16:18:30 2010 +0300 @@ -18,6 +18,13 @@ #include "common.h" #include +//Constants taken from SqlSrvConfig.h +#ifdef __WINSCW__ + const TInt KDefaultSoftHeapLimitKb = 1024; +#else + const TInt KDefaultSoftHeapLimitKb = 8192; +#endif + // Includes any code required for 'Code-Driven' testing, generally tests // that cannot be data-driven (or not completely). @@ -476,8 +483,17 @@ actual = asfs->SelectIntL(stmt8); else actual = asfs->SelectIntL(stmt); + TInt expected; - conv.Val(expected); + if (res.CompareF(_L("DEFAULT_SOFT_HEAP_LIMIT")) == 0) + { + expected = KDefaultSoftHeapLimitKb; + } + else + { + conv.Val(expected); + } + if( actual != expected ) { SetTestStepResult(EFail);