From 1c501793325ca172ee64d78700dc7f4bd881a53b Mon Sep 17 00:00:00 2001
From: danielk1977 <danielk1977@noemail.net>
Date: Sat, 11 Apr 2009 10:25:03 +0000
Subject: [PATCH] Replace invocation of (really_finish_test) from async.test
 with (finish_test). Otherwise a tcl exception may be thrown when running
 permutations. (CVS 6493)

FossilOrigin-Name: e6465e9da3d754833c21e0fb76c16a4efd047b91
---
 manifest        | 12 ++++++------
 manifest.uuid   |  2 +-
 test/async.test | 12 ++++++++----
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/manifest b/manifest
index 5ff1b528e3..9f509522d5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\ssqlite3PagerMovepage(),\savoid\sholding\sa\sreference\sto\spage\snumber\sX\swhen\scalling\ssqlite3PcacheRekey()\sto\smove\sanother\spage\sto\spage\snumber\sX.\s(CVS\s6492)
-D 2009-04-11T09:51:56
+C Replace\sinvocation\sof\s(really_finish_test)\sfrom\sasync.test\swith\s(finish_test).\sOtherwise\sa\stcl\sexception\smay\sbe\sthrown\swhen\srunning\spermutations.\s(CVS\s6493)
+D 2009-04-11T10:25:04
 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 a4868349ff65bab9b40c42f34a3eea4ecbbb5de7
+F test/async.test 44109d3ae82db2071e3c2b417f79258cc05f0f49
 F test/async2.test d3f23363553c2c02f15da98ae8bbc43420efd04c
 F test/async3.test e72255549dde94ef89e9779884001527b44c5389
 F test/attach.test 75a5d22f88e730967d68f2c9f95e786e3953d8e3
@@ -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 447e959594970a225a9b189e7e420ba9c3eedbdb
-R 5ba573ee34e62cb250fad53bba444e86
+P 4447c94f45b8abd833eb82b67233029088fd1a54
+R 4bd554f3a722f52dd92651334aebb128
 U danielk1977
-Z cd3b1bf74701b4585c67fc5dedab461b
+Z 42a24e3c74bfe026f17c04d99d336776
diff --git a/manifest.uuid b/manifest.uuid
index 89252b64b5..d238f7b6be 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4447c94f45b8abd833eb82b67233029088fd1a54
\ No newline at end of file
+e6465e9da3d754833c21e0fb76c16a4efd047b91
\ No newline at end of file
diff --git a/test/async.test b/test/async.test
index 5e075e15f5..33f86308fc 100644
--- a/test/async.test
+++ b/test/async.test
@@ -6,7 +6,7 @@
 #***********************************************************************
 # This file runs all tests.
 #
-# $Id: async.test,v 1.18 2009/04/10 20:55:14 drh Exp $
+# $Id: async.test,v 1.19 2009/04/11 10:25:04 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -23,9 +23,10 @@ proc finish_test {} {
   catch {db2 close}
   catch {db3 close}
 }
+if {[info exists ISQUICK]} { set ASYNC_SAVE_ISQUICK $ISQUICK }
 set ISQUICK 1
 
-set INCLUDE {
+set ASYNC_INCLUDE {
   insert.test
   insert2.test
   insert3.test
@@ -53,7 +54,7 @@ proc do_test {name args} {
 
 foreach testfile [lsort -dictionary [glob $testdir/*.test]] {
   set tail [file tail $testfile]
-  if {[lsearch -exact $INCLUDE $tail]<0} continue
+  if {[lsearch -exact $ASYNC_INCLUDE $tail]<0} continue
   source $testfile
 
   # Make sure everything is flushed through. This is because [source]ing 
@@ -77,8 +78,11 @@ sqlite3async_halt never
 sqlite3async_enable 0
 set sqlite3async_trace 0
 
-really_finish_test
 rename do_test {}
 rename async_really_do_test do_test
 rename finish_test {}
 rename async_really_finish_test finish_test
+
+if {[info exists ASYNC_SAVE_ISQUICK]} { set ISQUICK $ASYNC_SAVE_ISQUICK }
+finish_test
+
-- 
2.47.2