Merge test script fixes from trunk into this branch.

FossilOrigin-Name: 32f5f4613985283498162f2eaaba04316ee2f9ac6ce14bf238d36ebd16d55fa0

diff --cc manifest
index 53bc49da3f6bf0db503f15f20e845158774ea463,5615a01c67d61b0cc36a1381387e26516a13ec06..a7b307cf2f5416df2ec528bf86f795f2955ed5d1
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\slatest\schanges\sfrom\strunk,\sincluding\sthe\stemporary\sdb/ATTACH/master-journal\sfix.
- D 2017-11-17T13:23:44.351
 -C Add\ssome\smissing\s"finish_test"\slines\sto\sthe\send\sof\stest\sscripts.
 -D 2017-11-17T20:07:19.718
 -F Makefile.in b142eb20482922153ebc77b261cdfd0a560ed05a81e9f6d9a2b0e8192922a1d2
++C Merge\stest\sscript\sfixes\sfrom\strunk\sinto\sthis\sbranch.
++D 2017-11-17T20:10:12.906
 +F Makefile.in 28a879888205a67bd3b54c68afa1cd2e939e8ead2179b1177756a101dd1eb86e
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc a55372a22454e742ba7c8f6edf05b83213ec01125166ad7dcee0567e2f7fc81b
 +F Makefile.msc 9e7628ad7d33be39ac041e452e47e648ae3d14afbaaa254096e3a4d1d7c1c653
  F README.md f5c87359573c4d255425e588a56554b50fdcc2afba4e017a2e02a43701456afd
  F VERSION 0c10cdfed866fdd2d80434f64f042c3330f1daaed12e54287beb104f04b3faaf
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -559,9 -555,9 +559,9 @@@ F src/wal.h bada9007800e82f2765ad9ecd9f
  F src/walker.c da987a20d40145c0a03c07d8fefcb2ed363becc7680d0500d9c79915591f5b1f
  F src/where.c 031a80bcafe93934fd7052f3031c9e7eb36b61754c6c84d6bf0833184abad3db
  F src/whereInt.h 82c04c5075308abbac59180c8bad5ecb45b07453981f60a53f3c7dee21e1e971
- F src/wherecode.c 4a117dd5886616d074f7b6589c23bf742f5a9858d6ffdaf8b9d1f76ab06245d2
+ F src/wherecode.c 8605c0ca0c34d4692011cf68a5f4cfc85352c1df917dc6eada320cecc4f5ea73
  F src/whereexpr.c 427ea8e96ec24f2a7814c67b8024ad664a9c7656264c4566c34743cb23186e46
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1297,12 -1292,12 +1297,12 @@@ F test/threadtest3.c 38a612ea62854349ed
  F test/threadtest4.c c1e67136ceb6c7ec8184e56ac61db28f96bd2925
  F test/time-wordcount.sh 8e0b0f8109367827ad5d58f5cc849705731e4b90
  F test/tkt-02a8e81d44.test 6c80d9c7514e2a42d4918bf87bf6bc54f379110c
- F test/tkt-26ff0c2d1e.test 888324e751512972c6e0d1a09df740d8f5aaf660
+ F test/tkt-26ff0c2d1e.test c15bec890c4d226c0da2f35ff30f9e84c169cfef90e73a8cb5cec11d723dfa96
  F test/tkt-2a5629202f.test 0521bd25658428baa26665aa53ffed9367d33af2
 -F test/tkt-2d1a5c67d.test be1326f3061caec85085f4c9ee4490561ca037c0
 +F test/tkt-2d1a5c67d.test 58a56653795d1787f4ed661f9da7da153b0dc3f9
  F test/tkt-2ea2425d34.test 1cf13e6f75d149b3209a0cb32927a82d3d79fb28
  F test/tkt-31338dca7e.test 6fb8807851964da0d24e942f2e19c7c705b9fb58
 -F test/tkt-313723c356.test 4b306ad45c736cedf2f5221f6155b92143244b6d
 +F test/tkt-313723c356.test d78f772dd71d632f3d3f6d3d588c3105b2ab1bb3
  F test/tkt-385a5b56b9.test c0a06ada41d7f06b1686da0e718553f853771d1e
  F test/tkt-38cb5df375.test f3cc8671f1eb604d4ae9cf886ed4366bec656678
  F test/tkt-3998683a16.test 6d1d04d551ed1704eb3396ca87bb9ccc8c5c1eb7
@@@ -1682,7 -1677,7 +1682,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 85247880a68ab5b7b296a71661b4326250d6ecaa58982e7f8197da52c66dde0a 93e012a317c8a4bfb84327616a597acabfcb24417197eefdccb8031bcf64e0c0
- R 1a79c055aa11299eabdf81f9d9ce7c37
 -P 00c328317473cee8fd7bd92c58409a356337b727cfa562bd8de59350d978769c
 -R 7da8d3fa9a019a6fbc5c0bb38be51e2d
++P 162c7543654c79138b94c3f631d0e4fa6cc77360574a5bb44695bf3333a0eaa0 c21406ab3281480d3eddca0cdf5aea3abc224425ee52c10eed3ff702a0ae5c26
++R 05a6d04d3e83894666cf2c8630471af1
  U dan
- Z 54c84aac0c4f53ad3fc0713bd73fcf85
 -Z 96ccfa676c7df4dbf371fdb6ce8e1bc3
++Z 96e08d4c7de0b28e57fb4e8898f2ccd8

diff --cc manifest.uuid
index 44194182e0b0912e32e8f635a54c3ce1fc68be09,de5b2684380d4e0d99a9c6acd29deb7af0538e2c..926a598f3b795b17187234230cb8db8dc432e34d
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 162c7543654c79138b94c3f631d0e4fa6cc77360574a5bb44695bf3333a0eaa0
 -c21406ab3281480d3eddca0cdf5aea3abc224425ee52c10eed3ff702a0ae5c26
++32f5f4613985283498162f2eaaba04316ee2f9ac6ce14bf238d36ebd16d55fa0