From: dan <Dan Kennedy>
Date: Thu, 24 Aug 2023 13:42:10 +0000 (+0000)
Subject: Fix a test case problem in wal2recover2.test.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6859ca450f9d379facb26b29aed81fe2945c493b;p=thirdparty%2Fsqlite.git

Fix a test case problem in wal2recover2.test.

FossilOrigin-Name: 81361769e17b3d1589c5d0f9991a139963c6633d26bc72f189a69e0391d8f52f
---

diff --git a/manifest b/manifest
index 4d4e52024c..1b2b25d821 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s3.43.0\sfor\sthe\sreuse-schema\sbranch.
-D 2023-08-24T13:26:51.631
+C Fix\sa\stest\scase\sproblem\sin\swal2recover2.test.
+D 2023-08-24T13:42:10.775
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1898,7 +1898,7 @@ F test/wal2fault.test 2e8e60cacd5bcd451618aeffd05f676894d17202d3e2986e288d36e2c5
 F test/wal2lock.test 0ef98d72dc6bcf7711dedd684760488400d9a9a6eec0dc5d3822060437793552
 F test/wal2openclose.test 2b26be723ea7f4263c8d5d70b37efd1c359561a0526e39466c45fe8e6478daee
 F test/wal2recover.test 28b3fa0acb4e8725211a02803cd51116cd048841a876224f244af78039ba34fa
-F test/wal2recover2.test 2224dce37731db3a110161d516a1fc56aa38f6ac797aa1b50b983a0960b5d609
+F test/wal2recover2.test a7eece9892b125ef92343bba9e06edd5f6ad20c548dcbf79e3f2ab759f31ef84
 F test/wal2recover3.test 4a91689e165a38bc401736e6518188c2b0ff4fa1566d1810b8867536db128177
 F test/wal2rewrite.test 6ca6f631ffcf871240beab5f02608913fd075c6d0d31310b026c8383c65c9f9c
 F test/wal2rollback.test 23adc4a099b23f6aaea8b04fdca1c35861d887dd80f8be7da2d5273eb777e428
@@ -2129,8 +2129,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 4d8df0c426b8ce3db6cfb71e23f752026ef886b9bb833dc4be9717db9955b1db b5970fc4599d4fe81312e049420724b14e3d2c1de04769844fb1ab8d953170cd
-R 67ca6c8dee355cfd46b31c11a7cc35bf
-U drh
-Z 8dccb31785dbfc97f262cb4303268a7d
+P e7b1ee1a999ced9aaae66d3bf51d93c20909541a83ecba79a19e5573fa7d649e
+R 5c80d9074b4faf9a507a418409423616
+U dan
+Z a39e6907c614cd72c8ea05cb8a6c50e5
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 454d20cd89..10ea169847 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e7b1ee1a999ced9aaae66d3bf51d93c20909541a83ecba79a19e5573fa7d649e
\ No newline at end of file
+81361769e17b3d1589c5d0f9991a139963c6633d26bc72f189a69e0391d8f52f
\ No newline at end of file
diff --git a/test/wal2recover2.test b/test/wal2recover2.test
index cd99e71dd8..50a2fcf083 100644
--- a/test/wal2recover2.test
+++ b/test/wal2recover2.test
@@ -256,13 +256,19 @@ do_test 1.8.5 {
   fix_wal_cksums test.db-wal2
 } {}
 
+ifcapable oversize_cell_check {
+  set msg {database disk image is malformed}
+} else {
+  set msg {malformed database schema (?)}
+}
+
 do_test 1.8.6 {
   forcecopy test.db test.db2
   forcecopy test.db-wal test.db2-wal
   forcecopy test.db-wal2 test.db2-wal2
   sqlite3 db2 test.db2
   catchsql { SELECT * FROM sqlite_master } db2
-} {1 {database disk image is malformed}}
+} [list 1 $msg]
 db2 close
 
 #-------------------------------------------------------------------------