From: dan Date: Sat, 31 May 2025 19:55:07 +0000 (+0000) Subject: Update a few test scripts so that they run on windows. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=977b0f8813d24e64828e92f453b30cc22bbe2810;p=thirdparty%2Fsqlite.git Update a few test scripts so that they run on windows. FossilOrigin-Name: 14a18f4e3a3f35e636262a253364ab1e8054ed38c0c7fd482633522cbcf5ffc4 --- diff --git a/manifest b/manifest index 58cd7b8b71..2ba27879e5 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sassert()\sstatements\sin\sos_unix.c\sand\sos_win.c.\sAllow\swalsetlk_recover.test\sto\srun\sin\snon-SQLITE_ENABLE_SNAPSHOT\sbuilds. -D 2025-05-31T15:10:41.660 +C Update\sa\sfew\stest\sscripts\sso\sthat\sthey\srun\son\swindows. +D 2025-05-31T19:55:07.528 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -1664,7 +1664,7 @@ F test/skipscan5.test 0672103fd2c8f96bd114133f356192b35ece45c794fe3677e1d9e5e310 F test/skipscan6.test e2b256cf5d538a605beb97dc97ca5e2836dfc24c5e1d9b7a09e13c069a3b8b49 F test/snapshot.test a504f2e7009f512ef66c719f0ea1c55a556bdaf1e1312c80a04d46fc1a3e9632 F test/snapshot2.test 8d6ff5dd9cc503f6e12d408a30409c3f9c653507b24408d9cd7195931c89bc54 -F test/snapshot3.test 41350216abc6c7da37113ad462259c070786e5ad70bdc8709daaed148b1b3a2c +F test/snapshot3.test 2e0328ba019aa981848e10aded4d7dcd6094ec1f9c6290a34ab18415be0c44eb F test/snapshot4.test d4e9347ef2fcabc491fc893506c7bbaf334da3be111d6eb4f3a97cc623b78322 F test/snapshot_fault.test 129234ceb9b26a0e1000e8563a16e790f5c1412354e70749cbd78c3d5d07d60a F test/snapshot_up.test 77dc7853bfb2b4fa249f76e1714cfa1e596826165d9ef22c06ac3a0b7b778d9a @@ -2036,8 +2036,8 @@ F test/walseh1.test bae700eb99519b6d5cd3f893c04759accc5a59c391d4189fe4dd6995a533 F test/walsetlk.test 9079cd8ef82570b8cf0067f31e049a72bec353fb2d5f0cc88f1736dc42ba9704 F test/walsetlk2.test 9097083633cdf55bf1098b694fb8651d0356d38fef28b869481d18029d7ceaf4 F test/walsetlk3.test 1b82bd92dea7e58f498b4399b0b3d26773dd8ac5c74205ce4a23c207cb8e85fe -F test/walsetlk_recover.test 7c43dbcf550324ee1b37f40f21150bcbb66a028e4be5f10547599a34ffee9123 -F test/walsetlk_snapshot.test 6376fc8a76da4571eb35cf4aef06105f716c5e52f991cefec44b9c7015aadf1e +F test/walsetlk_recover.test fb9f922aeceaece4b156fcea99751ca6dc6a9111d81cd018f891631d9b923bbb +F test/walsetlk_snapshot.test 408e8b9b8b93366e8e3f1f748e755b21fb177c1b56210fe0c68e760ea1fb77f6 F test/walshared.test 42e3808582504878af237ea02c42ca793e8a0efaa19df7df26ac573370dbc7a3 F test/walslow.test 0c51843836c9dcf40a5ac05aa781bfb977b396ee2c872d92bd48b79d5dd9aa23 F test/walthread.test 14b20fcfa6ae152f5d8e12f5dc8a8a724b7ef189f5d8ef1e2ceab79f2af51747 @@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P a35236757ab57c4c9b34e47c5dbc10d8f1220f8152955f5303cf9c3902ee169b -R eaf3d33697a02bafeb3824ed740b8b2a +P 9f521ecda2b8d2f383cc84e308b3a4adfcf1bd6339eb834c8fa76c8704c861b7 +R 56c04d3126b92aeee5cfa0b7b54b5339 U dan -Z 2a8dae12be43752fd4cda67357fb4b7f +Z ced89a3dbbea8e62a4a96a4110c9937a # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 0991aa57a6..8873e50c22 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9f521ecda2b8d2f383cc84e308b3a4adfcf1bd6339eb834c8fa76c8704c861b7 +14a18f4e3a3f35e636262a253364ab1e8054ed38c0c7fd482633522cbcf5ffc4 diff --git a/test/snapshot3.test b/test/snapshot3.test index 470d463a66..6d57b1d0c4 100644 --- a/test/snapshot3.test +++ b/test/snapshot3.test @@ -96,6 +96,9 @@ do_test 1.8 { list [catch { sqlite3_snapshot_open_blob db3 main $snap } msg] $msg } {1 SQLITE_ERROR_SNAPSHOT} +db3 close +db2 close + #------------------------------------------------------------------------- reset_db do_execsql_test 2.0 { diff --git a/test/walsetlk_recover.test b/test/walsetlk_recover.test index 0b0977a362..f5b142ec12 100644 --- a/test/walsetlk_recover.test +++ b/test/walsetlk_recover.test @@ -55,7 +55,8 @@ testfixture_nb myvar { } # Give the [testfixture_nb] command time to start -after 1000 +after 1000 {set xyz 1} +vwait xyz testvfs tvfs -fullshm 1 sqlite3 db test.db -vfs tvfs diff --git a/test/walsetlk_snapshot.test b/test/walsetlk_snapshot.test index 35d70cd19a..b0453f7e51 100644 --- a/test/walsetlk_snapshot.test +++ b/test/walsetlk_snapshot.test @@ -62,7 +62,8 @@ testfixture_nb myvar { } # Give the [testfixture_nb] command time to start -after 1000 +after 1000 {set xyz 1} +vwait xyz db timeout 500 set tm [lindex [time {