Improved handling of the -v option on the fuzzcheck test program.

FossilOrigin-Name: c8cd7804dc905b2b20cd7c0192bcfaceaaa7e2a8

diff --git a/manifest b/manifest
index b710c6a5c31fbb9ed41c2aab9aa38f1619e56c64..39e9c1af0618ef1b37c07825981f3db38611b145 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sunnecessary\s"include\s<tcl.h>"\sline\sfrom\sfts5_test_mi.c.
-D 2016-02-18T13:32:34.131
+C Improved\shandling\sof\sthe\s-v\soption\son\sthe\sfuzzcheck\stest\sprogram.
+D 2016-02-18T14:03:15.183
 F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 30f075dc4f27a07abb76088946b2944178d85347
@@ -765,7 +765,7 @@ F test/fuzz2.test 76dc35b32b6d6f965259508508abce75a6c4d7e1
 F test/fuzz3.test b47377143f0c80f91ed29d722861077ff34415d5
 F test/fuzz_common.tcl a87dfbb88c2a6b08a38e9a070dabd129e617b45b
 F test/fuzz_malloc.test 328f70aaca63adf29b4c6f06505ed0cf57ca7c26
-F test/fuzzcheck.c 3b1707385ee81ae124a0f35c9df6d6d20550917a
+F test/fuzzcheck.c 19782d888c5542afe16d5c9336192761f38ea70b
 F test/fuzzdata1.db 7ee3227bad0e7ccdeb08a9e6822916777073c664
 F test/fuzzdata2.db f03a420d3b822cc82e4f894ca957618fbe9c4973
 F test/fuzzdata3.db c6586d3e3cef0fbc18108f9bb649aa77bfc38aba
@@ -1428,7 +1428,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh a98af506df552f3b3c0d904f94e4cdc4e1a6d598
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 80de1ad5eb4c3839756b6467d5b8195b4abfb1f8
-R 32cf564ef89201f9d7ee30986c17a6b0
-U dan
-Z 78ba4be2d3fd60f090cc3e09bd972230
+P 31d8b69e9e0747e573516570bfe2770384e99134
+R a027f18f6ed81f6dba546149a0b77304
+U drh
+Z 2e72dfb6b81d85b4231b0f2b20f67f3c

diff --git a/manifest.uuid b/manifest.uuid
index ca84a8cd7cc4c8a74c3b9c013fd7d436ea77b90d..b4de2ee70bae55b2ae1ff2f3969493b743ab4e9a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-31d8b69e9e0747e573516570bfe2770384e99134
\ No newline at end of file
+c8cd7804dc905b2b20cd7c0192bcfaceaaa7e2a8
\ No newline at end of file

diff --git a/test/fuzzcheck.c b/test/fuzzcheck.c
index cbe13eafe15ba215250f623bccc9adf34c6ff3ac..e3247b773b4e3192bd21591983873b6d9f99debd 100644 (file)
--- a/test/fuzzcheck.c
+++ b/test/fuzzcheck.c
@@ -784,8 +784,7 @@ static void showHelp(void){
 "  --export-db DIR       Write databases to files(s) in DIR. Works with --dbid\n"
 "  --export-sql DIR      Write SQL to file(s) in DIR. Also works with --sqlid\n"
 "  --help                Show this help text\n"
-"  -q                    Reduced output\n"
-"  --quiet               Reduced output\n"
+"  -q|--quiet            Reduced output\n"
 "  --limit-mem N         Limit memory used by test SQLite instance to N bytes\n"
 "  --limit-vdbe          Panic if an sync SQL runs for more than 100,000 cycles\n"
 "  --load-sql ARGS...    Load SQL scripts fro files into SOURCE-DB\n"
@@ -796,8 +795,7 @@ static void showHelp(void){
 "  --result-trace        Show the results of each SQL command\n"
 "  --sqlid N             Use only SQL where sqlid=N\n"
 "  --timeout N           Abort if any single test case needs more than N seconds\n"
-"  -v                    Increased output\n"
-"  --verbose             Increased output\n"
+"  -v|--verbose          Increased output.  Repeat for more output.\n"
   );
 }
 
@@ -920,8 +918,8 @@ int main(int argc, char **argv){
       }else
       if( strcmp(z,"verbose")==0 || strcmp(z,"v")==0 ){
         quietFlag = 0;
-        verboseFlag = 1;
-        runFlags |= SQL_TRACE;
+        verboseFlag++;
+        if( verboseFlag>1 ) runFlags |= SQL_TRACE;
       }else
       {
         fatalError("unknown option: %s", argv[i]);