From 37c906e63a52e43e2183aa916f994af519389c3f Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 19 Oct 2021 18:40:00 +0000 Subject: [PATCH 1/3] Update test scripts to unregister the test devsim VFS after it is used. FossilOrigin-Name: bb0e18ae4a49c305dd8b26886a3a4f3c6dad380edca57af835da4ad470ca8eb6 --- manifest | 16 ++++++++-------- manifest.uuid | 2 +- test/io.test | 2 ++ test/ioerr.test | 1 + 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index da493aacd0..5559b8cd9f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Remove\san\sincorrect\sassert()\sadded\s4\sdays\sago\sby\scheck-in\s[9e2f06b84f994277].\nReplace\sit\swith\sa\stestcase()\smacro. -D 2021-10-17T10:31:09.158 +C Update\stest\sscripts\sto\sunregister\sthe\stest\sdevsim\sVFS\safter\sit\sis\sused. +D 2021-10-19T18:40:00.827 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -1122,8 +1122,8 @@ F test/interrupt.test 16ea879ec728cb76414c148c5f24afd5d1f91054 F test/interrupt2.test e4408ca770a6feafbadb0801e54a0dcd1a8d108d F test/intpkey.test aee694afed1a65c86c4e69ad030224b3fc268113d00685234d40079fca16bad3 F test/intreal.test 2a87e85a5949bd55e41ef04c58f5800587c5380bdbc559ff1c79b614b0e6a533 -F test/io.test f95bca1783b01ea7761671560d023360d2dfa4cc -F test/ioerr.test 470fcc78e9cd352d162baf782fe301ea807d764241f58a48fc58109c2dfcdb6b +F test/io.test f138f3fe696d1ed8c51dfea5b325910d319a1b29e1d25ea57231a02092f02cca +F test/ioerr.test 530d05801ff1b6327018b2e140da34a74effa2773a844ddb8dc79c32e9567318 F test/ioerr2.test 2593563599e2cc6b6b4fcf5878b177bdd5d8df26 F test/ioerr3.test d3cec5e1a11ad6d27527d0d38573fbff14c71bdd F test/ioerr4.test f130fe9e71008577b342b8874d52984bd04ede2c @@ -1929,7 +1929,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 0bf42bb5611dc3f672cb898b8be245fd25f7a3862c1e0734effd18d75e812f22 -R d4b6322f84cb79bf03b64299a4029b40 -U drh -Z 3409a9b08242f867400967c13412f1bd +P 03dff7196bb00f8e32f574f65745ceafb33ee3fdd169263121342859c362eca5 +R 228163c3c451593d7cb8cf696feda116 +U dan +Z 8bc0ae3b5e97592532641791c4e91665 diff --git a/manifest.uuid b/manifest.uuid index d649a2f1f9..d546b2de3a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -03dff7196bb00f8e32f574f65745ceafb33ee3fdd169263121342859c362eca5 \ No newline at end of file +bb0e18ae4a49c305dd8b26886a3a4f3c6dad380edca57af835da4ad470ca8eb6 \ No newline at end of file diff --git a/test/io.test b/test/io.test index e1af808a3f..dfadcd1362 100644 --- a/test/io.test +++ b/test/io.test @@ -640,4 +640,6 @@ foreach {tn sql} { } sqlite3_simulate_device -char {} -sectorsize 0 +unregister_devsim + finish_test diff --git a/test/ioerr.test b/test/ioerr.test index f42beef5b4..29a3dede8a 100644 --- a/test/ioerr.test +++ b/test/ioerr.test @@ -334,6 +334,7 @@ do_ioerr_test ioerr-12 -ckrefcount true -erc 1 -tclprep { } sqlite3_simulate_device -char {} -sectorsize 0 catch {db close} +unregister_devsim do_ioerr_test ioerr-13 -ckrefcount true -erc 1 -sqlprep { PRAGMA auto_vacuum = incremental; From a24df58fe8284645379dc1845b09f0b7438e52e3 Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 19 Oct 2021 18:53:30 +0000 Subject: [PATCH 2/3] Fix permutations.test so that it can be called with a test file pattern that uses square brackets. FossilOrigin-Name: 55b6241871a3b52d835ebdc52a1ce6c736861cf7a03331391c5d6ffd39720514 --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/permutations.test | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 5559b8cd9f..507003ef18 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Update\stest\sscripts\sto\sunregister\sthe\stest\sdevsim\sVFS\safter\sit\sis\sused. -D 2021-10-19T18:40:00.827 +C Fix\spermutations.test\sso\sthat\sit\scan\sbe\scalled\swith\sa\stest\sfile\spattern\sthat\suses\ssquare\sbrackets. +D 2021-10-19T18:53:30.600 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -1274,7 +1274,7 @@ F test/parser1.test 6ccdf5e459a5dc4673d3273dc311a7e9742ca952dd0551a6a6320d27035c F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442 F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff -F test/permutations.test 536ab91e3d8fda6086ae6a3a0087d0750c95a412a9f3fb661e5a58de6d1b1224 +F test/permutations.test 68b6dcd2667acdc643140d502c0b6c503abe444495cf5d16aa3a4f0391604020 F test/pg_common.tcl 3b27542224db1e713ae387459b5d117c836a5f6e328846922993b6d2b7640d9f F test/pragma.test cae534c12a033a5c319ccc94f50b32811acdef9f67bf19a82ff42697caccd69f F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f @@ -1929,7 +1929,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 03dff7196bb00f8e32f574f65745ceafb33ee3fdd169263121342859c362eca5 -R 228163c3c451593d7cb8cf696feda116 +P bb0e18ae4a49c305dd8b26886a3a4f3c6dad380edca57af835da4ad470ca8eb6 +R e5353d6e7b1f6549937daad45541e7f2 U dan -Z 8bc0ae3b5e97592532641791c4e91665 +Z 7e291cd2bd650eb18863b06f63575d0e diff --git a/manifest.uuid b/manifest.uuid index d546b2de3a..7a716f5652 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -bb0e18ae4a49c305dd8b26886a3a4f3c6dad380edca57af835da4ad470ca8eb6 \ No newline at end of file +55b6241871a3b52d835ebdc52a1ce6c736861cf7a03331391c5d6ffd39720514 \ No newline at end of file diff --git a/test/permutations.test b/test/permutations.test index 7d2a0e58a7..0987daeb1d 100644 --- a/test/permutations.test +++ b/test/permutations.test @@ -1219,6 +1219,7 @@ if {[file tail $argv0] == "permutations.test"} { set S $::testspec($suite) set i 1 } else { + set suite default set S [list] set i 0 } @@ -1239,7 +1240,7 @@ if {[file tail $argv0] == "permutations.test"} { set extra [list -files $files] } - eval run_tests $suite $S $extra + eval [list run_tests $suite] $S $extra } } main $argv From 06ec7c662d5de8324fa80bf035920a7b4c82ef05 Mon Sep 17 00:00:00 2001 From: drh <> Date: Tue, 19 Oct 2021 18:59:10 +0000 Subject: [PATCH 3/3] Improved cleanup in finish_test so that specifying multiple test modules on the "./testfixture" command-line is more likely to work. FossilOrigin-Name: 3658417bf300e004e5166ee69aa2d8c70697b87ea7456cb6337b0ad6d60257d5 --- manifest | 14 +++++++------- manifest.uuid | 2 +- test/tester.tcl | 20 ++++++++++++++++---- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/manifest b/manifest index 507003ef18..5c7e84a489 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\spermutations.test\sso\sthat\sit\scan\sbe\scalled\swith\sa\stest\sfile\spattern\sthat\suses\ssquare\sbrackets. -D 2021-10-19T18:53:30.600 +C Improved\scleanup\sin\sfinish_test\sso\sthat\sspecifying\smultiple\stest\smodules\non\sthe\s"./testfixture"\scommand-line\sis\smore\slikely\sto\swork. +D 2021-10-19T18:59:10.277 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -1461,7 +1461,7 @@ F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30 F test/temptable2.test d2940417496e2b9548e01d09990763fbe88c316504033256d51493e1f1a5ce6a F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc -F test/tester.tcl 9426f7385393fbb6ba90e12ca51d0caf65e48b6a98c0dd169676d93b8c79d34c +F test/tester.tcl 2b55f29390d187026f187b5b82849a4001763960e5e90797ba2dc95c70fe77a6 F test/thread001.test b61a29dd87cf669f5f6ac96124a7c97d71b0c80d9012746072055877055cf9ef F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7 @@ -1929,7 +1929,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 bb0e18ae4a49c305dd8b26886a3a4f3c6dad380edca57af835da4ad470ca8eb6 -R e5353d6e7b1f6549937daad45541e7f2 -U dan -Z 7e291cd2bd650eb18863b06f63575d0e +P 55b6241871a3b52d835ebdc52a1ce6c736861cf7a03331391c5d6ffd39720514 +R cc426998f06e87a7bc21c105b31a88c7 +U drh +Z 41e8af220976b65d8b8f69383f67a625 diff --git a/manifest.uuid b/manifest.uuid index 7a716f5652..e9261140c8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -55b6241871a3b52d835ebdc52a1ce6c736861cf7a03331391c5d6ffd39720514 \ No newline at end of file +3658417bf300e004e5166ee69aa2d8c70697b87ea7456cb6337b0ad6d60257d5 \ No newline at end of file diff --git a/test/tester.tcl b/test/tester.tcl index 349a5d1232..68bff929cd 100644 --- a/test/tester.tcl +++ b/test/tester.tcl @@ -1203,14 +1203,29 @@ proc speed_trial_summary {name} { } } +# Clear out left-over configuration setup from the end of a test +# +proc finish_test_precleanup {} { + catch {db1 close} + catch {db2 close} + catch {db3 close} + unregister_devsim + unregister_jt_vfs + unregister_demovfs +} + # Run this routine last # proc finish_test {} { global argv + finish_test_precleanup if {[llength $argv]>0} { # If additional test scripts are specified on the command-line, # run them also, before quitting. - proc finish_test {} {return} + proc finish_test {} { + finish_test_precleanup + return + } foreach extra $argv { puts "Running \"$extra\"" db_delete_and_reopen @@ -1218,9 +1233,6 @@ proc finish_test {} { } } catch {db close} - catch {db1 close} - catch {db2 close} - catch {db3 close} if {0==[info exists ::SLAVE]} { finalize_testing } } proc finalize_testing {} {