Fix up test cases to account for the new SQLITE_LIMIT_WORKER_THREADS limit.

FossilOrigin-Name: 6483d426c4c5c772cd49412ea37e0fa7a0378904

diff --git a/manifest b/manifest
index 4860d29d3db1d94588ee6dc49363525ac2c23a4e..91746f068563d71505768fd1de9bfe54c3290074 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Set\sthe\sconnection-specific\slastRowid\svalue\sbefore\scalling\sany\sSQL\sfunction.
-D 2014-10-08T14:28:31.133
+C Fix\sup\stest\scases\sto\saccount\sfor\sthe\snew\sSQLITE_LIMIT_WORKER_THREADS\slimit.
+D 2014-10-08T15:53:21.620
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -237,7 +237,7 @@ F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c 961d5926e5a8fda611d385ec22c226b8635cd1cb
 F src/table.c 2e99ef7ef16187e17033d9398dc962ce22dab5cb
 F src/tclsqlite.c c67d310c833046cccc192125d64ad422ab882684
-F src/test1.c 523cd70ded28db71af9a30ec184cbe0957de9575
+F src/test1.c 518db4305d76b29dd9da3f022ca899c8fcdf9fc7
 F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
 F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
 F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@ -250,7 +250,7 @@ F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8
 F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
 F src/test_backup.c 3875e899222b651e18b662f86e0e50daa946344e
 F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
-F src/test_config.c 6f721f0337b96d58e81ff69bba101113c8168c2b
+F src/test_config.c a4cdebe093474c02eecc5e4008b1a22198edf975
 F src/test_demovfs.c 69b2085076654ebc18014cbc6386f04409c959a9
 F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
 F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
@@ -862,7 +862,7 @@ F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
 F test/speedtest1.c 83f6b3318f7ee60e52b978b5a5e5dd7e83dfb7ee
 F test/spellfix.test 24f676831acddd2f4056a598fd731a72c6311f49
-F test/sqllimits1.test b1aae27cc98eceb845e7f7adf918561256e31298
+F test/sqllimits1.test 9014524e7ab16e2a4976b13397db4c29cc29c6d9
 F test/stat.test 76fd746b85459e812a0193410fb599f0531f22de
 F test/stmt.test 25d64e3dbf9a3ce89558667d7f39d966fe2a71b9
 F test/subquery.test 666fdecceac258f5fd84bed09a64e49d9f37edd9
@@ -1203,7 +1203,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P e4b43967fd9a0b4944be9ab5575bff3678be8ed5
-R 4b3fd8ad675c779547c8afe5951393e2
+P dff0f6422e60a7e2e4efb658aab202a119cfa702
+R 7321f912fc295ac13d3e667e8ae8fde4
 U drh
-Z c9285a151f73aa9d039cef676eec6a31
+Z a0d7563bd184d766bb67ad4df881d191

diff --git a/manifest.uuid b/manifest.uuid
index 27c74f4c9b91988380c6e6c577b0d9c68b8066ca..44dfb5059319674384de0393879dd5e516ee9543 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dff0f6422e60a7e2e4efb658aab202a119cfa702
\ No newline at end of file
+6483d426c4c5c772cd49412ea37e0fa7a0378904
\ No newline at end of file

diff --git a/src/test1.c b/src/test1.c
index 62b575989d052c7c26f13cf3630bc704656b430a..85a16488ba850f82143dfd67f54a2eb673ac8db2 100644 (file)
--- a/src/test1.c
+++ b/src/test1.c
@@ -5513,10 +5513,11 @@ static int test_limit(
     { "SQLITE_LIMIT_LIKE_PATTERN_LENGTH", SQLITE_LIMIT_LIKE_PATTERN_LENGTH  },
     { "SQLITE_LIMIT_VARIABLE_NUMBER",     SQLITE_LIMIT_VARIABLE_NUMBER      },
     { "SQLITE_LIMIT_TRIGGER_DEPTH",       SQLITE_LIMIT_TRIGGER_DEPTH        },
+    { "SQLITE_LIMIT_WORKER_THREADS",      SQLITE_LIMIT_WORKER_THREADS       },
     
     /* Out of range test cases */
     { "SQLITE_LIMIT_TOOSMALL",            -1,                               },
-    { "SQLITE_LIMIT_TOOBIG",              SQLITE_LIMIT_TRIGGER_DEPTH+1      },
+    { "SQLITE_LIMIT_TOOBIG",              SQLITE_LIMIT_WORKER_THREADS+1     },
   };
   int i, id;
   int val;

diff --git a/src/test_config.c b/src/test_config.c
index 074faf2116985763172a9057654f19c66470c6cf..2c11f713fbd7384bc7f6c0aca2359a0c064d8656 100644 (file)
--- a/src/test_config.c
+++ b/src/test_config.c
@@ -644,6 +644,7 @@ Tcl_SetVar2(interp, "sqlite_options", "mergesort", "1", TCL_GLOBAL_ONLY);
   LINKVAR( DEFAULT_FILE_FORMAT );
   LINKVAR( MAX_ATTACHED );
   LINKVAR( MAX_DEFAULT_PAGE_SIZE );
+  LINKVAR( MAX_WORKER_THREADS );
 
   {
     static const int cv_TEMP_STORE = SQLITE_TEMP_STORE;

diff --git a/test/sqllimits1.test b/test/sqllimits1.test
index 2cbad3ffb884c0ef6cf8de621bfce6efb4344a4e..57fc931f7c3d945d6e459cbb6bd50ff6a5ff3b6a 100644 (file)
--- a/test/sqllimits1.test
+++ b/test/sqllimits1.test
@@ -51,6 +51,13 @@ do_test sqllimits1-1.9 {
 do_test sqllimits1-1.10 {
   sqlite3_limit db SQLITE_LIMIT_VARIABLE_NUMBER -1
 } $SQLITE_MAX_VARIABLE_NUMBER
+do_test sqllimits1-1.11 {
+  sqlite3_limit db SQLITE_LIMIT_TRIGGER_DEPTH -1
+} $SQLITE_MAX_TRIGGER_DEPTH
+do_test sqllimits1-1.12 {
+  sqlite3_limit db SQLITE_LIMIT_WORKER_THREADS 99999
+  sqlite3_limit db SQLITE_LIMIT_WORKER_THREADS -1
+} $SQLITE_MAX_WORKER_THREADS
 
 # Limit parameters out of range.
 #