Merge test script fixes from trunk.

FossilOrigin-Name: ea1d2cddd59192251ee5fd912b190cded4959879

diff --cc manifest
index ae6b61c7dee53a5e3045d16dbd209a72e14cd91e,73224a31d89872ec7606da6cb3f6c71dfda2fc41..0391aaeca72e76dc83e7e7f422dd5d1147df292c
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Many\smore\stest\scases\sfixed.\s\sOnly\sa\sfew\sremain.
- D 2016-03-14T18:34:42.199
 -C Fix\sthe\sbackcompat.test\sscript\sso\sthat\sit\sworks\swith\sthe\s--testdir\stest\soption.
 -D 2016-03-14T15:43:03.210
++C Merge\stest\sscript\sfixes\sfrom\strunk.
++D 2016-03-14T18:42:04.674
  F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
@@@ -481,13 -481,13 +481,13 @@@ F test/autoindex2.test 12ef578928102baa
  F test/autoindex3.test a3be0d1a53a7d2edff208a5e442312957047e972
  F test/autoindex4.test 49d3cd791a9baa16fb461d7ea3de80d019a819cf
  F test/autoindex5.test 96f084a5e6024ea07cace5888df3223f3ea86990
 -F test/autovacuum.test 941892505d2c0f410a0cb5970dfa1c7c4e5f6e74
 +F test/autovacuum.test 92c24eedbdb68e49f3fb71f26f9ce6d8988cac15
  F test/autovacuum_ioerr2.test 8a367b224183ad801e0e24dcb7d1501f45f244b4
  F test/avtrans.test 0252654f4295ddda3b2cce0e894812259e655a85
- F test/backcompat.test 28403f43d11624e696c5ef134c7c7d81015cd19e
+ F test/backcompat.test 3e64cedda754c778ef6bbe417b6e7a295e662a4d
  F test/backup.test b79299a536a4c6d919094786595b95be56d02014
  F test/backup2.test 34986ef926ea522911a51dfdb2f8e99b7b75ebcf
 -F test/backup4.test 2a2e4a64388090b152de753fd9e123f28f6a3bd4
 +F test/backup4.test 8f6fd48e0dfde77b9a3bb26dc471ede3e101df32
  F test/backup5.test ee5da6d7fe5082f5b9b0bbfa31d016f52412a2e4
  F test/backup_ioerr.test 4c3c7147cee85b024ecf6e150e090c32fdbb5135
  F test/backup_malloc.test 7162d604ec2b4683c4b3799a48657fb8b5e2d450
@@@ -1456,7 -1456,7 +1456,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 d866fffb8b1af5003a8730ce7029d1edddb24d46
- R 3cbc3d8762ef570c005be926f5a219e3
 -P 90e0cc7b0be31ee2f155c2c053b0cbac584f6154
 -R 02e42b4c9a3b088e9b811e95ac0b8895
 -U dan
 -Z adf33e3278f777c691b4da9ad8602fb1
++P 99b9d7eef68fd6d5c9eecb5fbe3dfe002c1ca4a8 f7480e33eb82f2eae219d17ce46cd2d4edac07d2
++R a4b3be370b53beddc257d6f309680c72
 +U drh
- Z 5481496fbfdbf0fce1abf7df1c171e0c
++Z 068814209d932469f07bb4748200130f

diff --cc manifest.uuid
index fd9549389f11beff4dadc95e7403c824e717ab13,352d97024961c9b5f0d4cbd262bed2f4c12422a8..873981d4c550134cfbbcce3f686d4541e352c01e
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 99b9d7eef68fd6d5c9eecb5fbe3dfe002c1ca4a8
 -f7480e33eb82f2eae219d17ce46cd2d4edac07d2
++ea1d2cddd59192251ee5fd912b190cded4959879