Fix an error message in speedtest1.c and make the "trigger" testset sensitive

to the --size parameter.

FossilOrigin-Name: 5a6fd9e0156a14e6509c4ea713c4b332b2d050432b49571c7a45a7ecc7cb5da4

diff --git a/manifest b/manifest
index 6010a2ba645a0877d00cbdaa4204ec77664c9042..11088844033075d092e313e554f1e6372aa3ca30 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sspeedtest1.c\swith\snew\stestset\s"trigger"\sbased\son\sthe\stests\sin\nspeed4p.test.
-D 2018-04-03T20:00:09.543
+C Fix\san\serror\smessage\sin\sspeedtest1.c\sand\smake\sthe\s"trigger"\stestset\ssensitive\nto\sthe\s--size\sparameter.
+D 2018-04-03T20:44:53.668
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 7016fc56c6b9bfe5daac4f34be8be38d8c0b5fab79ccbfb764d3b23bf1c6fff3
@@ -1271,7 +1271,7 @@ F test/speed3.test 694affeb9100526007436334cf7d08f3d74b85ef
 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 377a0c48e5a92e0b11c1c5ebb1bc9d83a7312c922bc0cb05970ef5d6a96d1f0c
-F test/speedtest1.c 3f17427600e858bcdaa0eb3075c1a2921c02db6d35a176c24a9dcd9b13d20812
+F test/speedtest1.c 20cc4028b0e88392b5a635c2ea5d5e777d569bf7258aead37f8be7a886c38344
 F test/spellfix.test 951a6405d49d1a23d6b78027d3877b4a33eeb8221dcab5704b499755bb4f552e
 F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3
 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33
@@ -1717,7 +1717,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 e171f3722f78c58d2f20443e3bbcce2bd9701b8537f6e8d482ae804154d7a17f
-R e402f9a2982145c160d4e44decc8af99
-U dan
-Z 88086f03d47fff48f3d9b964051d594b
+P 7b7fa5fa0dd0dcef759ce1e22ade3a4e5fc8e8a244eac19b1abcc96d89c99721
+R 4baf7dc282facc745e10c22f77c36581
+U drh
+Z bb4f0f244fe21a9d00e9e91cf5ed18f3

diff --git a/manifest.uuid b/manifest.uuid
index f7b1d383cb6e7bea96f56a902c8ad25ccf1d4b86..85893a877b61c4aaa1310c5364b3d1f9d05513d0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7b7fa5fa0dd0dcef759ce1e22ade3a4e5fc8e8a244eac19b1abcc96d89c99721
\ No newline at end of file
+5a6fd9e0156a14e6509c4ea713c4b332b2d050432b49571c7a45a7ecc7cb5da4
\ No newline at end of file

diff --git a/test/speedtest1.c b/test/speedtest1.c
index 0fbcce34209c30fe5119a9e90ea77484d8fcff92..2fcbbebd7f8c776f915e2f0b7622598a573eec57 100644 (file)
--- a/test/speedtest1.c
+++ b/test/speedtest1.c
@@ -1651,8 +1651,8 @@ void testset_trigger(void){
   int jj, ii;
   char zNum[2000];              /* A number name */
 
-  const int NROW  = 50000;
-  const int NROW2 = 10000;
+  const int NROW  = 500*g.szTest;
+  const int NROW2 = 100*g.szTest;
 
   speedtest1_exec(
       "BEGIN;"
@@ -2156,7 +2156,8 @@ int main(int argc, char **argv){
                 "the R-Tree tests\n");
 #endif
   }else{
-    fatal_error("unknown testset: \"%s\"\nChoices: main debug1 cte rtree fp\n",
+    fatal_error("unknown testset: \"%s\"\n"
+                "Choices: cte debug1 fp main orm rtree trigger\n",
                  zTSet);
   }
   speedtest1_final();