When using MSVC to build test code, suppress the popup dialog when abort is called...

FossilOrigin-Name: 55d3d39f1c653627fc4c048e12fdd8c4444b6de7

diff --git a/manifest b/manifest
index f70113ab94f4f1133adfdceaca27b0ad93416d4c..c8b5edc7847d8c2c4964554fb8012c2dc5b54acc 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\ssome\sMSVC\scompiler\swarnings\sin\sthe\sASYNC\sextension.
-D 2010-07-07T16:49:46
+C When\susing\sMSVC\sto\sbuild\stest\scode,\ssuppress\sthe\spopup\sdialog\swhen\sabort\sis\scalled\sfrom\sthe\ssqlite_abort()\stest\sfunction.
+D 2010-07-07T16:51:36
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in c4270a1cd7cd70a263b7e96a258aa90e9c3618eb
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -177,7 +177,7 @@ F src/sqliteLimit.h 196e2f83c3b444c4548fc1874f52f84fdbda40f3
 F src/status.c 4df6fe7dce2d256130b905847c6c60055882bdbe
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
 F src/tclsqlite.c b898ab058f51ee57e6b54aa8de902526a5376959
-F src/test1.c 87a90fbb0a3191b90561f818590e9806dc0ef80d
+F src/test1.c a48320a6481761c46b61ee1c1ee39177add8fccd
 F src/test2.c e3f564ab1e9fd0b47b0c9e23e7054e38bf0836cf
 F src/test3.c 4c21700c73a890a47fc685c1097bfb661346ac94
 F src/test4.c ad03bb987ddedce928f4258c1e7fa4109a73497d
@@ -831,7 +831,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P c41f04edb20c0c8fc8c49a53d42cc0b8a0ff7fe3
-R 9b2126a4d9ad3dbdc4271d526f5c179a
+P b951c8675df3e719c30a1dd94200b7c04252a3ea
+R 43e991ee321ad55068675a2f623b21b2
 U shaneh
-Z 7cb7549bc8684ba00d1de05338b5a361
+Z 68697bcc7d9a7e89050452dac7565276

diff --git a/manifest.uuid b/manifest.uuid
index 444af49aa8a28260d14e87dff101e7e1e6e9b3f8..fe0422947625ed989aaa1bfd4f62c39b4fb61b2b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b951c8675df3e719c30a1dd94200b7c04252a3ea
\ No newline at end of file
+55d3d39f1c653627fc4c048e12fdd8c4444b6de7
\ No newline at end of file

diff --git a/src/test1.c b/src/test1.c
index ec65df86cb8768ae7a520bbba4ea910d4a1843da..f8257e0c152d46f05f1c73afa324878e545547e5 100644 (file)
--- a/src/test1.c
+++ b/src/test1.c
@@ -1901,6 +1901,12 @@ static int sqlite_abort(
   int argc,              /* Number of arguments */
   char **argv            /* Text of each argument */
 ){
+#if defined(_MSC_VER)
+  /* We do this, otherwise the test will halt with a popup message
+   * that we have to click away before the test will continue.
+   */
+  _set_abort_behavior( 0, _CALL_REPORTFAULT );
+#endif
   assert( interp==0 );   /* This will always fail */
   abort();
   return TCL_OK;