Fixes to the pcache10 and pcache90 permutations.

FossilOrigin-Name: 597d40fa529073123a50ae6afc762c59404f8f5f

diff --git a/manifest b/manifest
index 471b36c6d3f03338aba7c82b24f6253e14937e9c..11f38150d0ac294efe8060b101d75ddc8307acce 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sproblems\swith\srunning\sthe\sasync.test\sscript.
-D 2010-07-13T07:38:51
+C Fixes\sto\sthe\spcache10\sand\spcache90\spermutations.
+D 2010-07-13T14:22:40
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -544,7 +544,7 @@ F test/pageropt.test 8146bf448cf09e87bb1867c2217b921fb5857806
 F test/pagesize.test 76aa9f23ecb0741a4ed9d2e16c5fa82671f28efb
 F test/pcache.test 4118a183908ecaed343a06fcef3ba82e87e0129d
 F test/pcache2.test 0d85f2ab6963aee28c671d4c71bec038c00a1d16
-F test/permutations.test fb0db23c3a5fe2f168aa85dd93934cd672e47802
+F test/permutations.test 89335d48dd350161cdc4a83ece83a54e9e5c6fc2
 F test/pragma.test ed78d200f65c6998df51196cb8c39d5300570f24
 F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
 F test/printf.test 05970cde31b1a9f54bd75af60597be75a5c54fea
@@ -834,7 +834,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P b73fe2754b68af4c76a1788aa18b93359720d1f1
-R 866cdebd403f026bbc759dc714e10b2e
+P 05ac2548652f3c9aa358289700b0b4c7fc22486d
+R d7ea8bae5d34f266c6513da1f61674ff
 U dan
-Z eb831fbf2f1d03728baf2844c2e1614f
+Z a4fee7d380a1fd69eda8299369e35825

diff --git a/manifest.uuid b/manifest.uuid
index 9c047454b4f51852cbaa3040c630caece87d5283..0638988b8eb7683cd66fe08597872bb76ba658a3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-05ac2548652f3c9aa358289700b0b4c7fc22486d
\ No newline at end of file
+597d40fa529073123a50ae6afc762c59404f8f5f
\ No newline at end of file

diff --git a/test/permutations.test b/test/permutations.test
index c54955d1bd453f5d7f9d6a1c7d80889703aa55ec..e5cbdb098dc510a636f4e609834364b1665287c9 100644 (file)
--- a/test/permutations.test
+++ b/test/permutations.test
@@ -661,87 +661,25 @@ set perm-alt-pcache-testset {
   update.test
 }
 
-test_suite "pcache0" -description {
-  Alternative pcache implementation without random discard
-} -initialize {
-  catch {db close}
-  sqlite3_shutdown
-  sqlite3_config_alt_pcache 1 0 1
-  sqlite3_initialize
-  autoinstall_test_functions
-} -shutdown {
-  catch {db close}
-  sqlite3_shutdown
-  sqlite3_config_alt_pcache 0 0 0
-  sqlite3_config_lookaside 100 500
-  install_malloc_faultsim 1 
-  sqlite3_initialize
-  autoinstall_test_functions
-} -files ${perm-alt-pcache-testset}
-
-test_suite "pcache10" -description {
-  Alternative pcache implementation without 10% random discard
-} -initialize {
-  catch {db close}
-  sqlite3_shutdown
-  sqlite3_config_alt_pcache 1 50 1
-  sqlite3_initialize
-  autoinstall_test_functions
-} -shutdown {
-  catch {db close}
-  sqlite3_shutdown
-  sqlite3_config_alt_pcache 0 0 0
-  sqlite3_initialize
-  autoinstall_test_functions
-} -files ${perm-alt-pcache-testset}
-
-test_suite "pcache50" -description {
-  Alternative pcache implementation without 50% random discard
-} -initialize {
-  catch {db close}
-  sqlite3_shutdown
-  sqlite3_config_alt_pcache 1 50 1
-  sqlite3_initialize
-  autoinstall_test_functions
-} -shutdown {
-  catch {db close}
-  sqlite3_shutdown
-  sqlite3_config_alt_pcache 0 0 0
-  sqlite3_initialize
-  autoinstall_test_functions
-} -files ${perm-alt-pcache-testset}
-
-test_suite "pcache90" -description {
-  Alternative pcache implementation without 90% random discard
-} -initialize {
-  catch {db close}
-  sqlite3_shutdown
-  sqlite3_config_alt_pcache 1 50 1
-  sqlite3_initialize
-  autoinstall_test_functions
-} -shutdown {
-  catch {db close}
-  sqlite3_shutdown
-  sqlite3_config_alt_pcache 0 0 0
-  sqlite3_initialize
-  autoinstall_test_functions
-} -files ${perm-alt-pcache-testset}
-
-test_suite "pcache100" -description {
-  Alternative pcache implementation that always discards when unpinning
-} -initialize {
-  catch {db close}
-  sqlite3_shutdown
-  sqlite3_config_alt_pcache 1 100 1
-  sqlite3_initialize
-  autoinstall_test_functions
-} -shutdown {
-  catch {db close}
-  sqlite3_shutdown
-  sqlite3_config_alt_pcache 0 0 0
-  sqlite3_initialize
-  autoinstall_test_functions
-} -files ${perm-alt-pcache-testset}
+foreach discard_rate {0 10 50 90 100} {
+  test_suite "pcache${discard_rate}" -description "
+    Alternative pcache implementation with ${discard_rate}% random discard
+  " -initialize "
+    catch {db close}
+    sqlite3_shutdown
+    sqlite3_config_alt_pcache 1 $discard_rate 1
+    sqlite3_initialize
+    autoinstall_test_functions
+  " -shutdown {
+    catch {db close}
+    sqlite3_shutdown
+    sqlite3_config_alt_pcache 0 0 0
+    sqlite3_config_lookaside 100 500
+    install_malloc_faultsim 1 
+    sqlite3_initialize
+    autoinstall_test_functions
+  } -files ${perm-alt-pcache-testset}
+}
 
 test_suite "journaltest" -description {
   Check that pages are synced before being written (test_journal.c).