Add a permutation test case for running all OOM tests with lookaside

disabled. (CVS 5517)

FossilOrigin-Name: 3f70e03ae83d374f5f69770bd7a4b279584f7090

diff --git a/manifest b/manifest
index 1ef211f673e8b44ade05a68d4600da5372067f9a..5122d047221e1957927a2a3d934b4d9fcb475eb5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Applied\spatch\sto\sfix\sfailure\swith\sbuild\son\sgcc-powerpc\s(provide\ssqlite3Hwtime).\sTicket\s#3256.\s(CVS\s5516)
-D 2008-08-01T14:33:15
+C Add\sa\spermutation\stest\scase\sfor\srunning\sall\sOOM\stests\swith\slookaside\ndisabled.\s(CVS\s5517)
+D 2008-08-01T15:06:30
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in bbb62eecc851379aef5a48a1bf8787eb13e6ec06
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -425,7 +425,7 @@ F test/misc3.test 7212ed8dad01427e9acab9bd3e7e5e2c2e89be9e
 F test/misc4.test 91e8ed25c092c2bb4e0bb01864631e2930f8d7de
 F test/misc5.test 6a5c1e3217a95b0db05ff9a0f1ecb5ce9043ffef
 F test/misc6.test 953cc693924d88e6117aeba16f46f0bf5abede91
-F test/misc7.test b0d80b95dc2b46ce417cf3e06bfff18166e55181
+F test/misc7.test 9aef880e037722f6a8549dfec4013080489ee822
 F test/misuse.test 30b3a458e5a70c31e74c291937b6c82204c59f33
 F test/mutex1.test 7f5e21fd11fe22de079e5dcd394ee4f6c257e68e
 F test/mutex2.test 56f282f436596e9febdc6e0db2c507432b6724bb
@@ -438,7 +438,7 @@ F test/pager2.test c025f91b75fe65e85febda64d9416428b8a5cab5
 F test/pager3.test 2323bf27fd5bd887b580247e5bce500ceee994b4
 F test/pageropt.test 6df72c441db0a037b7ec6990d16311c24fbea77b
 F test/pagesize.test e0a8b3fe80f8b8e808d94a00734c7a18c76c407e
-F test/permutations.test 39ab873ca79d0afe6b7075f200dc2cec8ecb1db3
+F test/permutations.test 0d2b34a203f63f4c8063e7849deb7ae6252c7411
 F test/pragma.test 2c675ed9a288094ed62bf55b35fbc749e25670fb
 F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
 F test/printf.test 262a5acd3158f788e9bdf7f18d718f3af32ff6ef
@@ -614,7 +614,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 70f20425e8197bce74b412f65050d954acb5bde4
-R 2d38dc146256265ec77d91cb755f3e60
-U shane
-Z 4375de578167b9cc339e50ddb4efab2f
+P c9ecd88e273aee56b4af5b69fae94e1f98d3e43d
+R 2a0f3659641a8b538a7fd6b0f31f5a68
+U drh
+Z 105cd4775e41bce932a17cb137180529

diff --git a/manifest.uuid b/manifest.uuid
index eee93d0484359f43eea44b3cc7a3bb707cdb5daf..958996822d41d433f66132d5cf0ce1b1a697e58c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c9ecd88e273aee56b4af5b69fae94e1f98d3e43d
\ No newline at end of file
+3f70e03ae83d374f5f69770bd7a4b279584f7090
\ No newline at end of file

diff --git a/test/misc7.test b/test/misc7.test
index f3418acd8050edcb4432b35a1b4719879a512d38..4a6bd9172243eb06db64f2ae3b47f5df9c3a09ed 100644 (file)
--- a/test/misc7.test
+++ b/test/misc7.test
@@ -10,7 +10,7 @@
 #***********************************************************************
 # This file implements regression tests for SQLite library.
 #
-# $Id: misc7.test,v 1.21 2008/07/11 13:53:55 drh Exp $
+# $Id: misc7.test,v 1.22 2008/08/01 15:06:30 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -456,6 +456,13 @@ do_test misc7-19.2 {
 } {21 0 0}
 
 
+# sqlite3_global_recover() is a no-op.  But we might as well test it
+# if only to get the test coverage.
+#
+do_test misc7-20.1 {
+  sqlite3_global_recover
+} {SQLITE_OK}
+
 
 db close
 file delete -force test.db

diff --git a/test/permutations.test b/test/permutations.test
index 738ab44ae19e5c433be816742dde798ee9ff5901..d893a1c3cf2734a9e9b0aa337a17432baba535fd 100644 (file)
--- a/test/permutations.test
+++ b/test/permutations.test
@@ -9,7 +9,7 @@
 #
 #***********************************************************************
 #
-# $Id: permutations.test,v 1.18 2008/07/30 13:15:46 drh Exp $
+# $Id: permutations.test,v 1.19 2008/08/01 15:06:30 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -173,6 +173,38 @@ run_tests "memsubsys2" -description {
   sqlite3_initialize
 }
 
+# Run all tests with the lookaside allocator disabled.
+#
+run_tests "memsubsys3" -description {
+  OOM tests with lookaside disabled
+} -include {
+  malloc.test
+  malloc3.test
+  malloc4.test
+  malloc5.test
+  malloc6.test
+  malloc7.test
+  malloc8.test
+  malloc9.test
+  mallocA.test
+  mallocB.test
+  mallocC.test
+  mallocD.test
+  mallocE.test
+  mallocF.test
+  mallocG.test
+} -initialize {
+  catch {db close}
+  sqlite3_shutdown
+  sqlite3_config_lookaside 0 0
+  sqlite3_initialize
+} -shutdown {
+  catch {db close}
+  sqlite3_shutdown
+  sqlite3_config_lookaside 100 500
+  sqlite3_initialize
+}
+
 # Run some tests in SQLITE_CONFIG_SINGLETHREAD mode.
 #
 run_tests "singlethread" -description {
@@ -364,6 +396,7 @@ ifcapable mem3 {
     sqlite3_reset_auto_extension
     sqlite3_shutdown
     sqlite3_config_heap 25000000 0
+    sqlite3_config_lookaside 0 0
     install_malloc_faultsim 1 
     sqlite3_initialize
     autoinstall_test_functions
@@ -372,6 +405,7 @@ ifcapable mem3 {
     sqlite3_reset_auto_extension
     sqlite3_shutdown
     sqlite3_config_heap 0 0
+    sqlite3_config_lookaside 100 500
     install_malloc_faultsim 1 
     sqlite3_initialize
   }
@@ -392,6 +426,7 @@ ifcapable mem5 {
     sqlite3_reset_auto_extension
     sqlite3_shutdown
     sqlite3_config_heap 25000000 64
+    sqlite3_config_lookaside 0 0
     install_malloc_faultsim 1 
     sqlite3_initialize
     autoinstall_test_functions
@@ -400,6 +435,7 @@ ifcapable mem5 {
     sqlite3_reset_auto_extension
     sqlite3_shutdown
     sqlite3_config_heap 0 0
+    sqlite3_config_lookaside 100 500
     install_malloc_faultsim 1 
     sqlite3_initialize
   }
@@ -413,6 +449,7 @@ ifcapable mem5 {
     sqlite3_reset_auto_extension
     sqlite3_shutdown
     sqlite3_config_heap 40000000 16
+    sqlite3_config_lookaside 0 0
     install_malloc_faultsim 1 
     sqlite3_initialize
     autoinstall_test_functions
@@ -421,6 +458,7 @@ ifcapable mem5 {
     sqlite3_reset_auto_extension
     sqlite3_shutdown
     sqlite3_config_heap 0 0
+    sqlite3_config_lookaside 100 500
     install_malloc_faultsim 1 
     sqlite3_initialize
   }