From: dan <Dan Kennedy>
Date: Fri, 4 Dec 2020 16:26:25 +0000 (+0000)
Subject: Fix a test script problem in walvfs.test.
X-Git-Tag: version-3.35.0~201
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee8221859b6ecc79fc33f7582f15602498b8daf1;p=thirdparty%2Fsqlite.git

Fix a test script problem in walvfs.test.

FossilOrigin-Name: 4c5076fbe42cc6447c47bfc202501f945f78bd716cbe8e33599c67b7d0956611
---

diff --git a/manifest b/manifest
index 3a03e90b15..18fc34100c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sincorrect\sdatatype\sno\sthe\ssqlite3WhereTrace\svariable\sin\stest1.c.
-D 2020-12-04T16:25:59.508
+C Fix\sa\stest\sscript\sproblem\sin\swalvfs.test.
+D 2020-12-04T16:26:25.602
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1714,7 +1714,7 @@ F test/walsetlk.test 11f7fe792fdce54cf09874dab824e0627f2eedecfb9f7983e325606ec51
 F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 F test/walslow.test c05c68d4dc2700a982f89133ce103a1a84cc285f
 F test/walthread.test 14b20fcfa6ae152f5d8e12f5dc8a8a724b7ef189f5d8ef1e2ceab79f2af51747
-F test/walvfs.test a2913001a83b19c1d20220e556cee14d87d47ecb6949b5e0a2e9e2590abecf1e
+F test/walvfs.test bccb3e0d235ef85e276f491d34db32c9ada1ea67be8d9f10aabe7b30319ec656
 F test/wapp.tcl b440cd8cf57953d3a49e7ee81e6a18f18efdaf113b69f7d8482b0710a64566ec
 F test/wapptest.tcl 899594e25684861d5b0c0880fb012364def50ef8097041b8ddf74be5ba7fa270 x
 F test/where.test e713c0c64e3e6b062235e39a2f7e5508c517df16b63d69fd786e26bc7330b1c6
@@ -1887,7 +1887,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 fb07c4e3c7ad3493c274cbfcf0dffdedcca18c0d90de04459134511d4e2a5277
-R ec7dd2e987372222def1ec4ae2f714bf
-U drh
-Z 07f297f45f5db93080b5cfd3b5bf2b1d
+P 4e6dab30f6d6795ecec9d8c4489fa4d210a3002715ad89812d65a1a846c164b9
+R 07161e41d5089cc6ef28f0415edcb9d6
+U dan
+Z 7e2ee23c5c662414c726391354dad230
diff --git a/manifest.uuid b/manifest.uuid
index 4d0b7df535..761f354c26 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4e6dab30f6d6795ecec9d8c4489fa4d210a3002715ad89812d65a1a846c164b9
\ No newline at end of file
+4c5076fbe42cc6447c47bfc202501f945f78bd716cbe8e33599c67b7d0956611
\ No newline at end of file
diff --git a/test/walvfs.test b/test/walvfs.test
index f21b65e7e9..d6c58656f0 100644
--- a/test/walvfs.test
+++ b/test/walvfs.test
@@ -146,16 +146,23 @@ proc xWrite {method file args} {
     incr ::cnt -1
     if {$::cnt==0} {
       sqlite3_memdebug_fail 1 -repeat 0
-      catchsql { SELECT 'a big long string!' }
+      # For this test to pass, the following statement must call malloc() at 
+      # least once. Even if the lookaside is enabled.
+      set ::xwrite_stmt_res [catchsql { SELECT hex(randomblob(4000)) }]
       sqlite3_interrupt db
     }
   }
   return SQLITE_OK
 }
 
+set ::xwrite_stmt_res ""
 do_catchsql_test 3.2 {
   PRAGMA wal_checkpoint
 } {1 {out of memory}}
+do_test 3.2.2 {
+  set ::xwrite_stmt_res
+} {1 {out of memory}}
+unset ::xwrite_stmt_res
 
 #-------------------------------------------------------------------------
 #