Re-enable the alt_pcache tests in permutations.test so that they run

automatically during a full regression.  Fix async.test so that it
works with the permutation.test pcacheNN test modules. (CVS 6486)

FossilOrigin-Name: 310192cc0fb56f8ffaa8e742f5600f16956212e7

diff --git a/manifest b/manifest
index 01e99197f52c8dcaf9196c86be1e50d8490d35db..788a2f2f5ea9df5b58c653ca45106d276848d493 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sMSVC\scompiler\swarning\sin\svdbeaux.c.\s(CVS\s6485)
-D 2009-04-10T15:42:36
+C Re-enable\sthe\salt_pcache\stests\sin\spermutations.test\sso\sthat\sthey\srun\nautomatically\sduring\sa\sfull\sregression.\s\sFix\sasync.test\sso\sthat\sit\nworks\swith\sthe\spermutation.test\spcacheNN\stest\smodules.\s(CVS\s6486)
+D 2009-04-10T18:21:29
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -219,7 +219,7 @@ F test/alter3.test 25b95a136708f22b87184fa6a4309eea03d65153
 F test/alter4.test 9386ffd1e9c7245f43eca412b2058d747509cc1f
 F test/altermalloc.test e81ac9657ed25c6c5bb09bebfa5a047cd8e4acfc
 F test/analyze.test ad5329098fe4de4a96852231d53e3e9e6283ad4b
-F test/async.test e7e6c5ef30c67531aad5c961e224bac91b88de16
+F test/async.test 73d5abb33e36f806cedd54663375481ee292568d
 F test/async2.test d3f23363553c2c02f15da98ae8bbc43420efd04c
 F test/async3.test e72255549dde94ef89e9779884001527b44c5389
 F test/attach.test 75a5d22f88e730967d68f2c9f95e786e3953d8e3
@@ -491,7 +491,7 @@ F test/pageropt.test 3ee6578891baaca967f0bd349e4abfa736229e1a
 F test/pagesize.test 0d9ff3fedfce6e5ffe8fa7aca9b6d3433a2e843b
 F test/pcache.test 70ad1d65cf73f6a0a7501e0236312eb214d93a55
 F test/pcache2.test 46efd980a89f737847b99327bda19e08fe11e402
-F test/permutations.test 4c25ae10e504c13dabe87ec6c67c6c4a062e5395
+F test/permutations.test f77d83a4c88f5fb6cc76df965cb58679a5b6917f
 F test/pragma.test a35b0be36542477183168cdb8b743f5c0d883c4d
 F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
 F test/printf.test 47e9e5bbec8509023479d54ceb71c9d05a95308a
@@ -717,7 +717,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 88cefbb4a12ab7037f025141ddbe041ea82a6c61
-R 7cd555ff696513b7fef9e34133f4d3b1
-U shane
-Z aa7c26992e02cec3c1ad9dee8fa0d36f
+P d619465e31c2366b389fea6ee2ce6b1806738a0f
+R e54eab000c593645d280ea28cdc3675f
+U drh
+Z e383dadd521e3e7a1f16c236342f29f3

diff --git a/manifest.uuid b/manifest.uuid
index 94a23ee67a1e6f97160a222e57c256a278fafd50..4a743787bbeb96c5053be9f97c81670ef8187712 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d619465e31c2366b389fea6ee2ce6b1806738a0f
\ No newline at end of file
+310192cc0fb56f8ffaa8e742f5600f16956212e7
\ No newline at end of file

diff --git a/test/async.test b/test/async.test
index 6519f99df1b86ef3c9055877d0f818cc49c0f003..c5283ad9f54693651b2826e3faa6157a52f711cf 100644 (file)
--- a/test/async.test
+++ b/test/async.test
@@ -6,7 +6,7 @@
 #***********************************************************************
 # This file runs all tests.
 #
-# $Id: async.test,v 1.16 2009/03/28 15:04:24 drh Exp $
+# $Id: async.test,v 1.17 2009/04/10 18:21:29 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -42,9 +42,9 @@ set INCLUDE {
 # Enable asynchronous IO.
 sqlite3async_enable 1
 
-rename do_test really_do_test
+rename do_test async_really_do_test
 proc do_test {name args} {
-  uplevel really_do_test async_io-$name $args
+  uplevel async_really_do_test async_io-$name $args
   sqlite3async_start
   sqlite3async_halt idle
   sqlite3async_wait
@@ -78,5 +78,7 @@ sqlite3async_enable 0
 set sqlite3async_trace 0
 
 really_finish_test
-rename really_do_test do_test
+rename do_test {}
+rename async_really_do_test do_test
+rename finish_test {}
 rename really_finish_test finish_test

diff --git a/test/permutations.test b/test/permutations.test
index b3c416f43020a374c03da17139d6e5aa0226e89d..275bdc0e4743894cb516686a4d9b44c21d5e7a31 100644 (file)
--- a/test/permutations.test
+++ b/test/permutations.test
@@ -9,7 +9,7 @@
 #
 #***********************************************************************
 #
-# $Id: permutations.test,v 1.47 2009/04/09 01:23:49 drh Exp $
+# $Id: permutations.test,v 1.48 2009/04/10 18:21:29 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -40,6 +40,7 @@ if {$::perm::testmode eq "all" || $::perm::testmode eq ""} {
     memsubsys1 memsubsys2 singlethread multithread onefile utf16 exclusive
     persistent_journal persistent_journal_error no_journal no_journal_error
     autovacuum_ioerr no_mutex_try fullmutex journaltest inmemory_journal
+    pcache0 pcache10 pcache50 pcache90 pcache100
   }
 }
 if {$::perm::testmode eq "targets"} {