From: larrybr <larrybr@noemail.net>
Date: Sat, 17 Apr 2021 18:43:29 +0000 (+0000)
Subject: Allow more time for perf tests when instrumented. Condition another on feature it... 
X-Git-Tag: version-3.36.0~185
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f5576936f1c229b88f4a8003d52c8ce745a63b06;p=thirdparty%2Fsqlite.git

Allow more time for perf tests when instrumented. Condition another on feature it needs.

FossilOrigin-Name: f0dd9cf2d7045d3634294bcf2722d3d7b0a6c4c3ef713b0f7f54fbe31432027f
---

diff --git a/manifest b/manifest
index e82be27f2a..0d0d684ac3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\snew\sdbsqlfuzz\scases\sto\stest/fuzzdata8.db.
-D 2021-04-17T18:39:39.769
+C Allow\smore\stime\sfor\sperf\stests\swhen\sinstrumented.\sCondition\sanother\son\sfeature\sit\sneeds.
+D 2021-04-17T18:43:29.186
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -567,7 +567,7 @@ F src/test_backup.c bf5da90c9926df0a4b941f2d92825a01bbe090a0
 F src/test_bestindex.c 78809f11026f18a93fcfd798d9479cba37e1201c830260bf1edc674b2fa9b857
 F src/test_blob.c ae4a0620b478548afb67963095a7417cd06a4ec0a56adb453542203bfdcb31ce
 F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274
-F src/test_config.c 80d097a0425514a5a14fd12204353d0844949a4979b4436572f222f9ac6d9c10
+F src/test_config.c 842ddde1f1d32c12f1651a77e51d6ccdb84697d5023be352c54683db930e9702
 F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f
 F src/test_demovfs.c 86142ba864d4297d54c5b2e972e74f3141ae4b30f05b3a95824184ed2d3d7f91
 F src/test_devsym.c aff2255ea290d7718da08af30cdf18e470ff7325a5eff63e0057b1496ed66593
@@ -1145,7 +1145,7 @@ F test/kvtest.c feb4358fb022da8ebd098c45811f2f6507688bb6c43aa72b3e840df19026317b
 F test/lastinsert.test 42e948fd6442f07d60acbd15d33fb86473e0ef63
 F test/laststmtchanges.test ae613f53819206b3222771828d024154d51db200
 F test/lemon-test01.y 58b764610fd934e189ffbb0bbfa33d171b9cb06019b55bdc04d090d6767e11d7
-F test/like.test 35e83182beb4c730d50e0f9aff7613fb5cdf8ca9147a833a77290fa5b8ba9474
+F test/like.test 5fe0bc37f307aef0a453ce2de4632bdfc0759448f0421c39f6d53caefe905fac
 F test/like2.test 3b2ee13149ba4a8a60b59756f4e5d345573852da
 F test/like3.test a76e5938fadbe6d32807284c796bafd869974a961057bc5fc5a28e06de98745c
 F test/limit.test 350f5d03c29e7dff9a2cde016f84f8d368d40bcd02fa2b2a52fa10c4bf3cbfaf
@@ -1294,11 +1294,11 @@ F test/recover.test ccb8c2623902a92ebb76770edd075cb4f75a4760bb7afde38026572c6e79
 F test/regexp1.test 497ea812f264d12b6198d6e50a76be4a1973a9d8
 F test/regexp2.test 40e894223b3d6672655481493f1be12012f2b33c
 F test/reindex.test cd9d6021729910ece82267b4f5e1b5ac2911a7566c43b43c176a6a4732e2118d
-F test/releasetest.tcl fb76d8fcc95ac29d6356cd9e52b726ab9e43a24082897618dfbcb7c2b0049153 x
-F test/releasetest_data.tcl 3d41ddb3f04f474ac9d925485da24ce6576ff0ebc4c7201c8a340bc09846c261
+F test/releasetest.tcl 8dcfc21d6b4a4a1d9a8503de0a94800d129ec8f03ef53d6e68b79ef78a786acd x
+F test/releasetest_data.tcl a864d27370e812c34a05224d6144ca082463906d5a4651782ad3b43712ab166a
 F test/resetdb.test 8062cf10a09d8c048f8de7711e94571c38b38168db0e5877ba7561789e5eeb2b
 F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
-F test/returning1.test b7ebb065d807c9ed8ebed98e96ca7ab1dea0f64e57d8b70808034201d4d56a6c
+F test/returning1.test 99012dc464860e1502153276d5e5c2bee32c53d3a866dcfc09b39932048e2276
 F test/rollback.test 06680159bc6746d0f26276e339e3ae2f951c64812468308838e0a3362d911eaa
 F test/rollback2.test 3f3a4e20401825017df7e7671e9f31b6de5fae5620c2b9b49917f52f8c160a8f
 F test/rollbackfault.test 0e646aeab8840c399cfbfa43daab46fd609cf04a
@@ -1913,7 +1913,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 62efe2eee34fdb147cc456290576d8fc3801487867c78aadd4485f85468d9ffc
-R e6d4f215d327dee505dbd3cfb3329e50
-U drh
-Z 27c775b084279a5bc5248aeaf9fef513
+P d18793e589a4ee7706e994a1f3d24ba7df190467d92fa6ac040258f4debc149d
+R 5f0f01941960771ce3466bb01e0efb08
+U larrybr
+Z 218f427ccf1a56a1ffaa0b35ea5e21ea
diff --git a/manifest.uuid b/manifest.uuid
index 0efa66cc59..75d888e0f8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d18793e589a4ee7706e994a1f3d24ba7df190467d92fa6ac040258f4debc149d
\ No newline at end of file
+f0dd9cf2d7045d3634294bcf2722d3d7b0a6c4c3ef713b0f7f54fbe31432027f
\ No newline at end of file
diff --git a/src/test_config.c b/src/test_config.c
index ac512fdb6f..5bf6ad63e2 100644
--- a/src/test_config.c
+++ b/src/test_config.c
@@ -65,6 +65,13 @@ static void set_options(Tcl_Interp *interp){
   Tcl_SetVar2(interp, "sqlite_options","casesensitivelike","0",TCL_GLOBAL_ONLY);
 #endif
 
+#ifdef CONFIG_SLOWDOWN_FACTOR
+  Tcl_SetVar2(interp, "sqlite_options","configslower",
+              STRINGVALUE(CONFIG_SLOWDOWN_FACTOR),TCL_GLOBAL_ONLY);
+#else
+  Tcl_SetVar2(interp, "sqlite_options","configslower","1.0",TCL_GLOBAL_ONLY);
+#endif
+
 #if !SQLITE_OS_WINCE && !SQLITE_OS_WINRT
   Tcl_SetVar2(interp, "sqlite_options", "curdir", "1", TCL_GLOBAL_ONLY);
 #else
diff --git a/test/like.test b/test/like.test
index ba9c15afcf..e8662dc6c3 100644
--- a/test/like.test
+++ b/test/like.test
@@ -1036,16 +1036,18 @@ do_test like-14.1 {
   set x [lindex [time {
     db one {SELECT 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz'GLOB'*a*a*a*a*a*a*a*a*y'}
   }] 0]
-  puts -nonewline " ($x ms - want less than 1000) "
-  expr {$x<1000}
+  set tlimit [expr {1000 * $::sqlite_options(configslower)}]
+  puts -nonewline " ($x ms - want less than $tlimit) "
+  expr {$x<$tlimit}
 } {1}
 ifcapable !icu {
   do_test like-14.2 {
     set x [lindex [time {
       db one {SELECT 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz'LIKE'%a%a%a%a%a%a%a%a%y'}
     }] 0]
-    puts -nonewline " ($x ms - want less than 1000) "
-    expr {$x<1000}
+  set tlimit [expr {1000 * $::sqlite_options(configslower)}]
+  puts -nonewline " ($x ms - want less than $tlimit) "
+  expr {$x<$tlimit}
   } {1}
 }
 
diff --git a/test/releasetest.tcl b/test/releasetest.tcl
index 37f00eb4c0..957be1b6fb 100755
--- a/test/releasetest.tcl
+++ b/test/releasetest.tcl
@@ -55,6 +55,7 @@ array set ::Configs [strip_comments {
   "Sanitize" {
     CC=clang -fsanitize=undefined
     -DSQLITE_ENABLE_STAT4
+    -DCONFIG_SLOWDOWN_FACTOR=5.0
     --enable-session
   }
   "Stdcall" {
@@ -254,6 +255,7 @@ array set ::Configs [strip_comments {
     -DSQLITE_ENABLE_FTS4
     -DSQLITE_ENABLE_RTREE
     -DSQLITE_ENABLE_HIDDEN_COLUMNS
+    -DCONFIG_SLOWDOWN_FACTOR=8.0
     --enable-json1
   }
 
diff --git a/test/releasetest_data.tcl b/test/releasetest_data.tcl
index b753259c58..62c1e55aa3 100644
--- a/test/releasetest_data.tcl
+++ b/test/releasetest_data.tcl
@@ -56,6 +56,7 @@ array set ::Configs [strip_comments {
   "Sanitize" {
     CC=clang -fsanitize=address,undefined
     -DSQLITE_ENABLE_STAT4
+    -DCONFIG_SLOWDOWN_FACTOR=5.0
     --enable-debug
     --enable-all
   }
@@ -258,6 +259,7 @@ array set ::Configs [strip_comments {
     -DSQLITE_ENABLE_FTS4
     -DSQLITE_ENABLE_RTREE
     -DSQLITE_ENABLE_HIDDEN_COLUMNS
+    -DCONFIG_SLOWDOWN_FACTOR=8.0
     --enable-json1
   }
 
diff --git a/test/returning1.test b/test/returning1.test
index 4f94cdfebe..25aaff43ef 100644
--- a/test/returning1.test
+++ b/test/returning1.test
@@ -184,10 +184,12 @@ do_catchsql_test 8.4 {
   INSERT INTO t1 VALUES(3) RETURNING a, (SELECT c FROM t2 WHERE t1.a=t2.b) AS x;
 } {0 {3 40}}
 
+ifcapable vtab {
 # dbsqlfuzz finds/crash-486f791cbe2dc45839310073e71367a1d8ad22dd
 do_catchsql_test 9.1 {
   UPDATE pragma_encoding SET encoding='UTF-8' RETURNING a, b, *;
 } {1 {table pragma_encoding may not be modified}}
+} ;# ifcapable vtab
 
 # dbsqlfuzz crash-0081f863d7b2002045ac2361879fc80dfebb98f1
 reset_db