In the speed-check.sh script, automatically invoke "fossil test-diff --tk" on

the cachegrind output against trunk, if not generating a trunk run.

FossilOrigin-Name: aa1ab37100a91ab4bb91d50a1267c26967efcb21

diff --git a/manifest b/manifest
index 41ba2e4d2c67da71a1ae10d8c23412beda9e6699..3e4c3fcfe410bc09a1ebc85eee068aeaeb0b9d75 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stypo\sin\sthe\sdocs\sfor\ssqlite3_update_hook().
-D 2017-01-28T06:50:15.642
+C In\sthe\sspeed-check.sh\sscript,\sautomatically\sinvoke\s"fossil\stest-diff\s--tk"\son\nthe\scachegrind\soutput\sagainst\strunk,\sif\snot\sgenerating\sa\strunk\srun.
+D 2017-01-28T13:40:55.453
 F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -1508,7 +1508,7 @@ F tool/showstat4.c b14159aa062f661b394ba37b6b7b94bfb8012ab9
 F tool/showwal.c ec79959834f7b21f1e0a2aa52bb7c056d2203977
 F tool/soak1.tcl 8d407956e1a45b485a8e072470a3e629a27037fe
 F tool/spaceanal.tcl ab7d9bf68062907282a64b3e12ccbfad47193c5a
-F tool/speed-check.sh 65ac2f5b00771b9dcefb95bebae1aab76c537ea3
+F tool/speed-check.sh 9630ba0468b609c52f48309243d4eb6e9c34deda
 F tool/speedtest.tcl 06c76698485ccf597b9e7dbb1ac70706eb873355
 F tool/speedtest16.c ecb6542862151c3e6509bbc00509b234562ae81e
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
@@ -1548,7 +1548,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 24e77c1cef163a9822635570b3211789ff23d5c9
-R f1c881d122d9ce415eab840d4253340a
-U dan
-Z 83c68a9a3025b00f2574a4c70122bf9b
+P 7c029655cc3369a1e46741fdd3701d36d420b28b
+R e044c4e027113b10098b21316c3901f3
+U drh
+Z 82ae1e57a20d4dbe9187373cc6493ae1

diff --git a/manifest.uuid b/manifest.uuid
index 140867e58873e71cffe654a2e9c30dbe4066e436..fc7ceb70f43ace18d959e635f590578696727d5e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7c029655cc3369a1e46741fdd3701d36d420b28b
\ No newline at end of file
+aa1ab37100a91ab4bb91d50a1267c26967efcb21
\ No newline at end of file

diff --git a/tool/speed-check.sh b/tool/speed-check.sh
index c6f587e1772512ab2bd279bbc620d27dbf58788e..1e1389f2fd0b6c634c438a555cc63e0d7bd6f029 100644 (file)
--- a/tool/speed-check.sh
+++ b/tool/speed-check.sh
@@ -142,3 +142,6 @@ fi
 if test $doExplain -eq 1; then
   ./speedtest1 --explain $SPEEDTEST_OPTS | ./sqlite3 >explain-$NAME.txt
 fi
+if test "$NAME" != "trunk"; then
+  fossil test-diff --tk cout-trunk.txt cout-$NAME.txt
+fi