Adjust a test case in triggerC.test to handle non-default SQLITE_MAX_TRIGGER_DEPTH...

FossilOrigin-Name: f14339c54bdeabc68c1e05b2c63ee95226f184e0

diff --git a/manifest b/manifest
index ab5444fc1d064d9976cd2ab99acd290197ff4213..57f92c97563bc0830203c96a6eae91cfc08ce606 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\sflush\sof\sstdout\sso\ssome\stest\scode\sreading\sfrom\sa\scommand\spipe\sworks\scorrectly\son\sWindows.
-D 2011-06-22T14:21:31.932
+C Adjust\sa\stest\scase\sin\striggerC.test\sto\shandle\snon-default\sSQLITE_MAX_TRIGGER_DEPTH\ssettings.
+D 2011-06-22T14:43:59.375
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -838,7 +838,7 @@ F test/trigger8.test 30cb0530bd7c4728055420e3f739aa00412eafa4
 F test/trigger9.test 5b0789f1c5c4600961f8e68511b825b87be53e31
 F test/triggerA.test eaf11a29db2a11967d2d4b49d37f92bce598194e
 F test/triggerB.test 56780c031b454abac2340dbb3b71ac5c56c3d7fe
-F test/triggerC.test 811ab569af9e6fc894afbcc0d77d14500b2406c5
+F test/triggerC.test 02c690febf608ae20b9af86184a9867f79855b1d
 F test/triggerD.test c6add3817351451e419f6ff9e9a259b02b6e2de7
 F test/tt3_checkpoint.c 415eccce672d681b297485fc20f44cdf0eac93af
 F test/types.test bf816ce73c7dfcfe26b700c19f97ef4050d194ff
@@ -948,7 +948,7 @@ F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00
 F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d
-P 6e1f4df51ad32e36715cba16f9df0d17a08dc653
-R f419aa12fb8154184260ed77fe4da08c
+P 6705f21effaa2f72dc5e17e888d679b8d35c2c3a
+R 87da11704e690d7cf704bfee15761e8a
 U shaneh
-Z 359a9455871f477fa2aa903e2701f33c
+Z 7c44dac3b62246a10bc140e2fc2fcdfe

diff --git a/manifest.uuid b/manifest.uuid
index 4799754faabd800a1bf78a852756c2e11362e5b8..5bee5deb53fbb79cf3bf05d527b5c5e7777c9152 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6705f21effaa2f72dc5e17e888d679b8d35c2c3a
\ No newline at end of file
+f14339c54bdeabc68c1e05b2c63ee95226f184e0
\ No newline at end of file

diff --git a/test/triggerC.test b/test/triggerC.test
index a54aa62fae7c601de4c8a647f9b74cf882abd455..e5a492a4129a0488f3440344128752780fabcf78 100644 (file)
--- a/test/triggerC.test
+++ b/test/triggerC.test
@@ -228,22 +228,22 @@ foreach {n tdefn rc} {
 }
 
 do_test triggerC-2.2 {
-  execsql {
+  execsql "
     CREATE TABLE t22(x);
 
     CREATE TRIGGER t22a AFTER INSERT ON t22 BEGIN
       INSERT INTO t22 SELECT x + (SELECT max(x) FROM t22) FROM t22;
     END;
     CREATE TRIGGER t22b BEFORE INSERT ON t22 BEGIN
-      SELECT CASE WHEN (SELECT count(*) FROM t22) >= 100
+      SELECT CASE WHEN (SELECT count(*) FROM t22) >= [expr $SQLITE_MAX_TRIGGER_DEPTH / 2]
                   THEN RAISE(IGNORE)
                   ELSE NULL END;
     END;
 
     INSERT INTO t22 VALUES(1);
     SELECT count(*) FROM t22;
-  }
-} {100}
+  "
+} [list [expr $SQLITE_MAX_TRIGGER_DEPTH / 2]]
 
 do_test triggerC-2.3 {
   execsql "