From: dan <Dan Kennedy>
Date: Fri, 12 Feb 2021 21:22:01 +0000 (+0000)
Subject: Fix a test case to account for the fact that different versions of OpenBSD behave... 
X-Git-Tag: version-3.35.0~100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b7e93adbce69298fb80c69dbeae5db167f5d7a9;p=thirdparty%2Fsqlite.git

Fix a test case to account for the fact that different versions of OpenBSD behave differently when a program tries to read() from a file-descriptor open on a directory.

FossilOrigin-Name: ecd712032f56a20d7df2bcf89b0d3b8d91dc72c552e27f0a4b23980bd49747b0
---

diff --git a/manifest b/manifest
index b7380e82b2..40173b5a69 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sRBU\stests\sare\srun\sas\spart\sof\srelease\stesting.
-D 2021-02-12T11:37:13.786
+C Fix\sa\stest\scase\sto\saccount\sfor\sthe\sfact\sthat\sdifferent\sversions\sof\sOpenBSD\sbehave\sdifferently\swhen\sa\sprogram\stries\sto\sread()\sfrom\sa\sfile-descriptor\sopen\son\sa\sdirectory.
+D 2021-02-12T21:22:01.411
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -697,7 +697,7 @@ F test/autovacuum_ioerr2.test 8a367b224183ad801e0e24dcb7d1501f45f244b4
 F test/avtrans.test b7dc25459ecbd86c6fa9c606ee3068f59d81e225118617dcf2bbb6ded2ade89e
 F test/backcompat.test 3e64cedda754c778ef6bbe417b6e7a295e662a4d
 F test/backup.test dd4a5ff756e3df3931dacb1791db0584d4bad989
-F test/backup2.test 1fd1ad8c5b3d2d5b9c0cce4143a4fc610d51ddc6ae16a7a122973d43e6b50bbd
+F test/backup2.test f52e3b87f39d1b826d4f622eafe5d30260ae5bdb05764843ff7c83057b05ed49
 F test/backup4.test 8f6fd48e0dfde77b9a3bb26dc471ede3e101df32
 F test/backup5.test ee5da6d7fe5082f5b9b0bbfa31d016f52412a2e4
 F test/backup_ioerr.test 4c3c7147cee85b024ecf6e150e090c32fdbb5135
@@ -1899,7 +1899,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 66c07a07b21e46529780eec3c82a84c494d586f8b7ed80b78d358e23b80458c7
-R 9b461eb226a7d68884e4035e774a75a3
+P a18dc08bafefd849e640086b18c41e06361d2e09d7dd2e9af4a394dc543e598b
+R 75ef21488d6a3f284e4e31927f38030c
 U dan
-Z d41690f6a24f168371741e4cbc675a70
+Z 408da0e65feec11d579f305d93e52369
diff --git a/manifest.uuid b/manifest.uuid
index 69cc053376..56987518bf 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a18dc08bafefd849e640086b18c41e06361d2e09d7dd2e9af4a394dc543e598b
\ No newline at end of file
+ecd712032f56a20d7df2bcf89b0d3b8d91dc72c552e27f0a4b23980bd49747b0
\ No newline at end of file
diff --git a/test/backup2.test b/test/backup2.test
index b58c6a3cd3..8b9cb8731a 100644
--- a/test/backup2.test
+++ b/test/backup2.test
@@ -144,7 +144,7 @@ do_test backup2-9 {
 if {$tcl_platform(platform)=="windows"} {
   set msg {cannot open source database: unable to open database file}
 } elseif {[string match *BSD $tcl_platform(os)]} {
-  set msg {restore failed: file is not a database}
+  set msg {}
 } else {
   set msg {cannot open source database: disk I/O error}
 }
@@ -152,7 +152,8 @@ do_test backup2-10 {
   forcedelete bu3.db
   file mkdir bu3.db
   set rc [catch {db restore temp bu3.db} res]
-  lappend rc $res
+  if {0==[string match *BSD $tcl_platform(os)]} { lappend rc $res }
+  set rc
 } [list 1 $msg]
 
 # Try to restore from something that is not a database file.