Fix a couple minor test issues.

FossilOrigin-Name: 1f1866d11c2fe3804ebc64cc7a54061c1d6db8650c2f19b43b70831afee53f2a

diff --git a/manifest b/manifest
index efc97a04a8e077304d09bafa8ec0a0d208267d81..9d74def502376aa51a3ad9152781a5edf7a09cb4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Work\saround\slack\sof\sa\sC99\sfeature\sin\sMSVC.
-D 2019-04-17T23:32:17.004
+C Fix\sa\scouple\sminor\stest\sissues.
+D 2019-04-17T23:56:54.310
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -548,7 +548,7 @@ F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf
 F src/test_demovfs.c a0c3bdd45ed044115c2c9f7779e56eafff18741e
 F src/test_devsym.c 1960abbb234b97e9b920f07e99503fc04b443f62bbc3c6ff2c2cea2133e3b8a2
 F src/test_fs.c ba1e1dc18fd3159fdba0b9c4256f14032159785320dfbd6776eb9973cb75d480
-F src/test_func.c 181f992e5495644434c4f0e3cc72362a78c295eb2cf3ff4d02498b8bde7aa276
+F src/test_func.c 9180857ac71f9001ef899edce62b02119c1d20b4e7ee152642ba64272898af49
 F src/test_hexio.c 1d4469ca61ab202a1fcec6543f584d2407205e8d
 F src/test_init.c 4413c211a94b62157ca4c145b3f27c497f03c664
 F src/test_intarray.c 39b4181662a0f33a427748d87218e7578d913e683dc27eab7098bb41617cac71
@@ -637,7 +637,7 @@ F test/analyze5.test 765c4e284aa69ca172772aa940946f55629bc8c4
 F test/analyze6.test 7b2667b879976ac4b90d8df80d5456328684f1f6f6fdef9469d6e53401f2f469
 F test/analyze7.test a37f4d9cb699a8af068ae02df1bb08bf844df8e98a92a8126cbff89e226879d8
 F test/analyze8.test e32a970564271114786703750e6939cf81dea4b8580874e38e9213ee092f6936
-F test/analyze9.test 9fbf0e0101eef4f5dc149769aa14e10b76ee06e7c28598264b32173cd1999a54
+F test/analyze9.test ff43df879a741c91a5eb29925c16df630fab7d91cc9cbbf2a88d7ab4be32ad9c
 F test/analyzeA.test 22a892d67bd2223126335b99774cce56ba91122cfe82446d2927afc43ad667dc
 F test/analyzeB.test a4c1c3048f6d9e090eb76e83eecb18bcf6d31a70
 F test/analyzeC.test 555a6cc388b9818b6eda6df816f01ce0a75d3a93
@@ -1818,10 +1818,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 03f2e78899fad99b0a0951b3a408268276954d4cd785389ed9a0192c9217f6fe
-R 9cef56448f8c03c887a8a21c2bbed2e4
-T *branch * msvc
-T *sym-msvc *
-T -sym-trunk *
+P f6ebe1c2be91f1f02b2a68fa11d6da981d35771b5ad422e72a64a66ee1084f0d
+R 0d6ae83ec007891187d975026a136170
 U mistachkin
-Z f283cca61d2ec3a64f3eb769927e0f9e
+Z 26092ffd8a652a1c29f2562b3137103b

diff --git a/manifest.uuid b/manifest.uuid
index 457e4722c8efa7977bde0b3d02280b5f586676fb..cd6e8988072ca3279caaf26a8f1763cba328b0c9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f6ebe1c2be91f1f02b2a68fa11d6da981d35771b5ad422e72a64a66ee1084f0d
\ No newline at end of file
+1f1866d11c2fe3804ebc64cc7a54061c1d6db8650c2f19b43b70831afee53f2a
\ No newline at end of file

diff --git a/src/test_func.c b/src/test_func.c
index b7c9e08ceb38091b2b8a93b50c6ef727fd8fd851..bb96d3a801d9be8d27a3fbca17dc42d4b6fa60b9 100644 (file)
--- a/src/test_func.c
+++ b/src/test_func.c
@@ -529,6 +529,13 @@ static void test_decode(
   u8 *pBody;                      /* Current point in record data */
   u64 nHdr;                       /* Bytes in record header */
   Tcl_Obj *pRet;                  /* Return value */
+  Mem *pMem;                      /* Pointer to memory cell */
+
+  pMem = sqlite3_malloc(sizeof(Mem));
+  if( pMem==0 ){
+    sqlite3_result_error_nomem(context);
+    return;
+  }
 
   pRet = Tcl_NewObj();
   Tcl_IncrRefCount(pRet);
@@ -541,17 +548,16 @@ static void test_decode(
   while( pHdr<pEndHdr ){
     Tcl_Obj *pVal = 0;
     u64 iSerialType;
-    Mem mem;
 
-    memset(&mem, 0, sizeof(mem));
-    mem.db = db;
-    mem.enc = ENC(db);
+    memset(pMem, 0, sizeof(Mem));
+    pMem->db = db;
+    pMem->enc = ENC(db);
     pHdr += sqlite3GetVarint(pHdr, &iSerialType);
-    pBody += sqlite3VdbeSerialGet(pBody, (u32)iSerialType, &mem);
+    pBody += sqlite3VdbeSerialGet(pBody, (u32)iSerialType, pMem);
 
-    switch( sqlite3_value_type(&mem) ){
+    switch( sqlite3_value_type(pMem) ){
       case SQLITE_TEXT:
-        pVal = Tcl_NewStringObj((const char*)sqlite3_value_text(&mem), -1);
+        pVal = Tcl_NewStringObj((const char*)sqlite3_value_text(pMem), -1);
         break;
 
       case SQLITE_BLOB: {
@@ -559,8 +565,8 @@ static void test_decode(
           '0', '1', '2', '3', '4', '5', '6', '7',
           '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
         };
-        int n = sqlite3_value_bytes(&mem);
-        u8 *z = (u8*)sqlite3_value_blob(&mem);
+        int n = sqlite3_value_bytes(pMem);
+        u8 *z = (u8*)sqlite3_value_blob(pMem);
         int i;
         pVal = Tcl_NewStringObj("x'", -1);
         for(i=0; i<n; i++){
@@ -575,11 +581,11 @@ static void test_decode(
       }
 
       case SQLITE_FLOAT:
-        pVal = Tcl_NewDoubleObj(sqlite3_value_double(&mem));
+        pVal = Tcl_NewDoubleObj(sqlite3_value_double(pMem));
         break;
 
       case SQLITE_INTEGER:
-        pVal = Tcl_NewWideIntObj(sqlite3_value_int64(&mem));
+        pVal = Tcl_NewWideIntObj(sqlite3_value_int64(pMem));
         break;
 
       case SQLITE_NULL:
@@ -592,13 +598,14 @@ static void test_decode(
 
     Tcl_ListObjAppendElement(0, pRet, pVal);
 
-    if( mem.szMalloc ){
-      sqlite3DbFree(db, mem.zMalloc);
+    if( pMem->szMalloc ){
+      sqlite3DbFree(db, pMem->zMalloc);
     }
   }
 
   sqlite3_result_text(context, Tcl_GetString(pRet), -1, SQLITE_TRANSIENT);
   Tcl_DecrRefCount(pRet);
+  sqlite3_free(pMem);
 }
 
 /*

diff --git a/test/analyze9.test b/test/analyze9.test
index 75a02653d11eec92aa7d33fb1a2cde8ad0005276..cedf98997df833caed347fbfe3e5146d0432d487 100644 (file)
--- a/test/analyze9.test
+++ b/test/analyze9.test
@@ -808,7 +808,7 @@ do_test 16.1 {
     ANALYZE;
   }
   set nByte2 [lindex [sqlite3_db_status db SCHEMA_USED 0] 1]
-  puts -nonewline " (nByte=$nByte nByte2=$nByte2)"
+  # puts -nonewline " (nByte=$nByte nByte2=$nByte2)"
 
   expr {$nByte2 > $nByte+900 && $nByte2 < $nByte+1100}
 } {1}