From: drh <drh@noemail.net>
Date: Thu, 12 Nov 2015 21:42:40 +0000 (+0000)
Subject: Add a space before each line of error output in the test scripts so that all
X-Git-Tag: version-3.10.0~141
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d66b2e02ee523ac6bb44ab75f3426a0bcb3617c2;p=thirdparty%2Fsqlite.git

Add a space before each line of error output in the test scripts so that all
errors can be conveniently located in logs by doing "grep '^ '".

FossilOrigin-Name: 9d532fb50d310df629ea65193f21dc9b3594ff5f
---

diff --git a/manifest b/manifest
index 183d8a99ba..3af41656d6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssupport\sfor\sthe\sSQLITE_SQLLOG_CONDITIONAL\senvironment\svariable\sto\sthe\slogging\scode\sin\stest_sqllog.c.\sWhen\sdefined,\slogging\sis\sonly\sperformed\sif\sthe\s"<database>-sqllog"\sfile\sis\spresent\sin\sthe\sfile\ssystem\swhen\sthe\smain\sdatabase\sis\sopened.
-D 2015-11-12T20:12:51.646
+C Add\sa\sspace\sbefore\seach\sline\sof\serror\soutput\sin\sthe\stest\sscripts\sso\sthat\sall\nerrors\scan\sbe\sconveniently\slocated\sin\slogs\sby\sdoing\s"grep\s'^\s'".
+D 2015-11-12T21:42:40.423
 F Makefile.in d828db6afa6c1fa060d01e33e4674408df1942a1
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e928e68168df69b353300ac87c10105206653a03
@@ -931,7 +931,7 @@ F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
 F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
 F test/permutations.test 4ea119731c62d2f7d0aa86dd5b184cbb61ca411b
 F test/pragma.test a44253f911e7d50127d4a08f927f47c861a4c772
-F test/pragma2.test a8e11a7a38e2a5053fe4b807fc806c937d9a7469
+F test/pragma2.test 1a4cc20b0cd8fc6411bd2f828cdc3ea1bdd570b9
 F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
 F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
 F test/printf2.test 0b61566dd1c0f0b802f59dffa228c5dc5aa6b054
@@ -1060,7 +1060,7 @@ F test/tclsqlite.test 7fb866443c7deceed22b63948ccd6f76b52ad054
 F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
 F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
 F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
-F test/tester.tcl 83cc29c89259490b25d2d7e47535d6f2ed5a57c7
+F test/tester.tcl 87a4d4533f55c586bc17bca5b96d381a7fe328e0
 F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
 F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@ -1278,7 +1278,7 @@ F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
 F test/vtab_shared.test ea8778d5b0df200adef2ca7c00c3c37d4375f772
 F test/wal.test dbfc482e10c7263298833bb1fc60b3ac9d6340a1
 F test/wal2.test 1f841d2048080d32f552942e333fd99ce541dada
-F test/wal3.test 2ab8e490afe0164bfc89b185c8b2572e0d821f23
+F test/wal3.test b1d425f68a1f61d12563f0fa1ee6fca7d5afabf4
 F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 F test/wal5.test 88b5d9a6a3d1532497ee9f4296f010d66f07e33c
 F test/wal6.test 4421cd5a2fa99d29cc91ef12fb23bed171ed3a4c
@@ -1403,7 +1403,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P f79d264db24a470d1a4571e15a99cd3d68b5166c
-R 832ba4972d7900eed0d1e5716cf55baa
-U dan
-Z 957802b71a98a3fb9167ff96a716895f
+P cab8126be9f63dd596719b12704ba77c128282bc
+R 285b415177be5b2cab525b82d9f69ae9
+U drh
+Z a7a38819a361f89adc4ae5f714679f1c
diff --git a/manifest.uuid b/manifest.uuid
index 2eb3af5615..093fb4fd1f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cab8126be9f63dd596719b12704ba77c128282bc
\ No newline at end of file
+9d532fb50d310df629ea65193f21dc9b3594ff5f
\ No newline at end of file
diff --git a/test/pragma2.test b/test/pragma2.test
index 9cb31fa14f..c8d87663c1 100644
--- a/test/pragma2.test
+++ b/test/pragma2.test
@@ -135,6 +135,8 @@ delete_file test.db test.db-journal
 delete_file test2.db test2.db-journal
 sqlite3 db test.db
 do_execsql_test pragma2-4.1 {
+  PRAGMA main.cache_size=2000;
+  PRAGMA temp.cache_size=2000;
   PRAGMA cache_spill;
   PRAGMA main.cache_spill;
   PRAGMA temp.cache_spill;
diff --git a/test/tester.tcl b/test/tester.tcl
index d7effc6038..647daa1f41 100644
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@ -746,8 +746,8 @@ proc do_test {name cmd expected} {
         # if {![info exists ::testprefix] || $::testprefix eq ""} {
         #   error "no test prefix"
         # }
-        output2_if_no_verbose -nonewline $name...
-        output2 "\nExpected: \[$expected\]\n     Got: \[$result\]"
+        output1 ""
+        output2 " $name expected: \[$expected\]\n $name got:      \[$result\]"
         fail_test $name
       } else {
         output1 " Ok"
@@ -1047,7 +1047,7 @@ proc finalize_testing {} {
     foreach {rec} [lsort $omitList] {
       if {$rec==$prec} continue
       set prec $rec
-      output2 [format {  %-12s %s} [lindex $rec 0] [lindex $rec 1]]
+      output2 [format {.  %-12s %s} [lindex $rec 0] [lindex $rec 1]]
     }
   }
   if {$nErr>0 && ![working_64bit_int]} {
diff --git a/test/wal3.test b/test/wal3.test
index bd312b349c..9ee8a99458 100644
--- a/test/wal3.test
+++ b/test/wal3.test
@@ -275,9 +275,9 @@ proc lock_callback {method filename handle lock} {
   if {$lock == "1 7 lock exclusive"} { return SQLITE_BUSY }
   return SQLITE_OK
 }
-puts "  Warning: This next test case causes SQLite to call xSleep(1) 100 times."
-puts "  Normally this equates to a 100ms delay, but if SQLite is built on unix"
-puts "  without HAVE_USLEEP defined, it may be 100 seconds."
+puts "# Warning: This next test case causes SQLite to call xSleep(1) 100 times."
+puts "# Normally this equates to a 100ms delay, but if SQLite is built on unix"
+puts "# without HAVE_USLEEP defined, it may be 100 seconds."
 do_test wal3-4.3 {
   db close
   set ::locks [list]
@@ -285,7 +285,7 @@ do_test wal3-4.3 {
   catchsql { SELECT * FROM x }
 } {1 {locking protocol}}
 
-puts "  Warning: Same again!"
+puts "# Warning: Same again!"
 proc lock_callback {method filename handle lock} {
   if {$lock == "0 1 lock exclusive"} { return SQLITE_BUSY }
   return SQLITE_OK