From 04df18dce8ca75fbe1f4c421ff069d5543c7fe7a Mon Sep 17 00:00:00 2001
From: drh <drh@noemail.net>
Date: Tue, 6 Jan 2009 14:50:11 +0000
Subject: [PATCH] Update permutations.test so that it does not show an error
 when running the singlethread and multithread test cases on THREADSAFE=0
 builds. (CVS 6119)

FossilOrigin-Name: 301b57b7bac949dd77037ad3175ba87c41c8c843
---
 manifest               | 14 +++++++-------
 manifest.uuid          |  2 +-
 test/permutations.test | 34 +++++++++++++---------------------
 3 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/manifest b/manifest
index 426f704235..e8bd739007 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\smemory\sleak\sin\stest_journal.c\s(test\scode).\sAlso\sremove\sfunction\spager_truncate_cache(),\sa\swrapper\saround\ssqlite3PCacheTruncate(),\sfrom\spager.c.\s(CVS\s6118)
-D 2009-01-06T14:34:35
+C Update\spermutations.test\sso\sthat\sit\sdoes\snot\sshow\san\serror\swhen\srunning\nthe\ssinglethread\sand\smultithread\stest\scases\son\sTHREADSAFE=0\sbuilds.\s(CVS\s6119)
+D 2009-01-06T14:50:11
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 05461a9b5803d5ad10c79f989801e9fd2cc3e592
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -477,7 +477,7 @@ F test/pageropt.test 3ee6578891baaca967f0bd349e4abfa736229e1a
 F test/pagesize.test 0d9ff3fedfce6e5ffe8fa7aca9b6d3433a2e843b
 F test/pcache.test 515b4c26e9f57660357dfff5b6b697acac1abc5f
 F test/pcache2.test 46efd980a89f737847b99327bda19e08fe11e402
-F test/permutations.test 9e667c6b027856fc9b1d3d82cb51f0744885d010
+F test/permutations.test af0962c17a32631de8b301c301c497adea9739f4
 F test/pragma.test 325aa0833d483b8e0c98e8196f1cc49fa5d8c336
 F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
 F test/printf.test 262a5acd3158f788e9bdf7f18d718f3af32ff6ef
@@ -692,7 +692,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P da770a8dff183b28aca287cafb9c8b82b98ea968
-R 2172b16d676a799e44e84c464b6413bf
-U danielk1977
-Z a44d18eb329206a7ca5cf0468ff0c42d
+P a64f3db0b39af53c8d8f80c242baa8aa4b5bd04e
+R 7c4f8eabbf5a60a91f851023ba3b8043
+U drh
+Z cc04516c576e9544afd34428d80e3ec0
diff --git a/manifest.uuid b/manifest.uuid
index 8e306a7452..fe8934a919 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a64f3db0b39af53c8d8f80c242baa8aa4b5bd04e
\ No newline at end of file
+301b57b7bac949dd77037ad3175ba87c41c8c843
\ No newline at end of file
diff --git a/test/permutations.test b/test/permutations.test
index bd92896d5a..ec1615c3b4 100644
--- a/test/permutations.test
+++ b/test/permutations.test
@@ -9,7 +9,7 @@
 #
 #***********************************************************************
 #
-# $Id: permutations.test,v 1.43 2009/01/06 13:40:08 danielk1977 Exp $
+# $Id: permutations.test,v 1.44 2009/01/06 14:50:11 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -234,21 +234,17 @@ run_tests "nolookaside" -description {
 run_tests "singlethread" -description {
   Tests run in SQLITE_CONFIG_SINGLETHREAD mode
 } -initialize {
-  do_test mutex2-singlethread.0 {
-    catch {db close}
-    sqlite3_shutdown
-    sqlite3_config singlethread
-  } SQLITE_OK
+  catch {db close}
+  sqlite3_shutdown
+  catch {sqlite3_config singlethread}
 } -include {
   delete.test   delete2.test  insert.test  rollback.test  select1.test
   select2.test  trans.test    update.test  vacuum.test    types.test
   types2.test   types3.test
 } -shutdown {
-  do_test mutex2-X {
-    catch {db close}
-    sqlite3_shutdown
-    sqlite3_config serialized
-  } SQLITE_OK
+  catch {db close}
+  sqlite3_shutdown
+  catch {sqlite3_config serialized}
 }
 
 run_tests "nomutex" -description {
@@ -275,21 +271,17 @@ run_tests "nomutex" -description {
 run_tests "multithread" -description {
   Tests run in SQLITE_CONFIG_MULTITHREAD mode
 } -initialize {
-  do_test mutex2-multithread.0 {
-    catch {db close}
-    sqlite3_shutdown
-    sqlite3_config multithread
-  } SQLITE_OK
+  catch {db close}
+  sqlite3_shutdown
+  catch {sqlite3_config multithread}
 } -include {
   delete.test   delete2.test  insert.test  rollback.test  select1.test
   select2.test  trans.test    update.test  vacuum.test    types.test
   types2.test   types3.test
 } -shutdown {
-  do_test mutex2-X {
-    catch {db close}
-    sqlite3_shutdown
-    sqlite3_config serialized
-  } SQLITE_OK
+  catch {db close}
+  sqlite3_shutdown
+  catch {sqlite3_config serialized}
 }
 
 # Run some tests in SQLITE_OPEN_FULLMUTEX mode.