From 34c61e68ad2d5fb23b231e74bd070aff7d1dcdd8 Mon Sep 17 00:00:00 2001
From: danielk1977 <danielk1977@noemail.net>
Date: Fri, 29 Aug 2008 12:00:20 +0000
Subject: [PATCH] In permutations.test, disable tests that depend on
 soft-heap-limit functionality when running the memsubsys2 variant. It
 disables the soft-heap-limit. (CVS 5639)

FossilOrigin-Name: 047c7bdb9f37462c462071334f1cb9d3400917db
---
 manifest               | 12 ++++++------
 manifest.uuid          |  2 +-
 test/permutations.test |  9 ++++++++-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index 39dc294cdc..a45199ab6d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C If\sa\spage\sis\smade\seligible\sfor\srecycling\swhen\smore\sthan\sthe\sconfigured\smaximum\snumber\sof\spages\sare\sallocated,\sfree\sit\simmediately\sinstead\sof\sadding\sit\sto\sthe\sLRU\slist.\s(CVS\s5638)
-D 2008-08-29T09:10:03
+C In\spermutations.test,\sdisable\stests\sthat\sdepend\son\ssoft-heap-limit\sfunctionality\swhen\srunning\sthe\smemsubsys2\svariant.\sIt\sdisables\sthe\ssoft-heap-limit.\s(CVS\s5639)
+D 2008-08-29T12:00:20
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 689e14735f862a5553bceef206d8c13e29504e44
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -446,7 +446,7 @@ F test/pager3.test 2323bf27fd5bd887b580247e5bce500ceee994b4
 F test/pageropt.test 3ee6578891baaca967f0bd349e4abfa736229e1a
 F test/pagesize.test 0d9ff3fedfce6e5ffe8fa7aca9b6d3433a2e843b
 F test/pcache.test a0fc9e965d039c4de24f9af929f9a25eb8be8539
-F test/permutations.test e16bbd8cf443dd637317d9085b67bbdf91f21a1c
+F test/permutations.test fcd155dd44b8e85377e57643dd6e7929309e8259
 F test/pragma.test b55931bbd5dd543e56fd942dbf4b7439619b09a6
 F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
 F test/printf.test 262a5acd3158f788e9bdf7f18d718f3af32ff6ef
@@ -627,7 +627,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P ab0292caa5887cc1bdc0e8c9d3f3502b83975440
-R b8688b362830896e075bddc5ac84e1a4
+P 4b12922dcb4547bf3a7276d0542b2e1d12ad338d
+R 2ffa9bd2f8d79fb5963ae5f5988d926b
 U danielk1977
-Z e3ebfdb580a05ecf955ac9f707aeb447
+Z 546ff8821ac9632bfb1f8285195992ba
diff --git a/manifest.uuid b/manifest.uuid
index e9f6d7b708..c7535e84f4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4b12922dcb4547bf3a7276d0542b2e1d12ad338d
\ No newline at end of file
+047c7bdb9f37462c462071334f1cb9d3400917db
\ No newline at end of file
diff --git a/test/permutations.test b/test/permutations.test
index f6336ae8b8..775f0eea05 100644
--- a/test/permutations.test
+++ b/test/permutations.test
@@ -9,7 +9,7 @@
 #
 #***********************************************************************
 #
-# $Id: permutations.test,v 1.24 2008/08/26 23:08:04 drh Exp $
+# $Id: permutations.test,v 1.25 2008/08/29 12:00:20 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -175,8 +175,15 @@ run_tests "memsubsys1" -description {
 # Run some tests using pre-allocated page and scratch blocks. This time
 # the allocations are too small to use in most cases.
 #
+# Both ioerr5.test and malloc5.test are excluded because they test the
+# sqlite3_soft_heap_limit() and sqlite3_release_memory() functionality.
+# This functionality is disabled if a pre-allocated page block is provided.
+#
 run_tests "memsubsys2" -description {
   Tests using small pre-allocated page and scratch blocks
+} -exclude {
+  ioerr5.test
+  malloc5.test
 } -initialize {
   catch {db close}
   sqlite3_shutdown