Fix speedtest1 so that it automatically unlinks its test database prior

to startup.

FossilOrigin-Name: b65b69f6b686c6555876b6fc701da95cc49120b5

diff --git a/manifest b/manifest
index 6ca8cb523470aa431964b9c617fbd2b3fc5fc99f..2d86b5ab271c69f1d3d94983a05590e8658a0648 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\s--temp\soption\sto\sthe\sspeedtest1.c\sperformance\stest\sprogram.
-D 2016-04-12T16:59:39.643
+C Fix\sspeedtest1\sso\sthat\sit\sautomatically\sunlinks\sits\stest\sdatabase\sprior\nto\sstartup.
+D 2016-04-12T17:13:33.302
 F Makefile.in eba680121821b8a60940a81454316f47a341487a
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836
@@ -1083,7 +1083,7 @@ F test/speed3.test d32043614c08c53eafdc80f33191d5bd9b920523
 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
-F test/speedtest1.c 870ea1f3086ace7125f578cfae7ac1137b3e0bdd
+F test/speedtest1.c 4476f7030775507f060d27b789e1f4123c5a5866
 F test/spellfix.test f9c1f431e2c096c8775fec032952320c0e4700db
 F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3
 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33
@@ -1482,7 +1482,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 662c32af0276a9ef4eea2d29e2523ccc44b6d128
-R cf025f2af3ea009a3845c13fd71354e9
+P 8053a6e2bf616fc9326f0323962176e318d7d2a5
+R 3ae5c3c6eb252cc89c8a785d5876dd69
 U drh
-Z ba428edd13c3659c3e56c28f6b7f2005
+Z 19aed5e20f081d47becc5b2db0de637c

diff --git a/manifest.uuid b/manifest.uuid
index 3197cf8598d92d3fd3b70279499e33986f8d99a5..a2fb63115877e71cdb856a31f479f5ab70590156 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8053a6e2bf616fc9326f0323962176e318d7d2a5
\ No newline at end of file
+b65b69f6b686c6555876b6fc701da95cc49120b5
\ No newline at end of file

diff --git a/test/speedtest1.c b/test/speedtest1.c
index bcd85b049bf0129e82753a1cd67818b0d2e27075..2d337d470588d0fa7a06ae2b070275febcc6b23f 100644 (file)
--- a/test/speedtest1.c
+++ b/test/speedtest1.c
@@ -1369,11 +1369,7 @@ int main(int argc, char **argv){
                   argv[i], argv[0]);
     }
   }
-#if 0
-  if( zDbName==0 ){
-    fatal_error(zHelp, argv[0]);
-  }
-#endif
+  if( zDbName!=0 ) unlink(zDbName);
 #if SQLITE_VERSION_NUMBER>=3006001
   if( nHeap>0 ){
     pHeap = malloc( nHeap );