Disable the atof1.test module when compiling on MSVC.

FossilOrigin-Name: 0f706acfc7181f2714a06b2c232677ebeede3a44

diff --git a/manifest b/manifest
index bd1f4838173aef5224e8848e9088529f7b74a4f8..de8e9b1ae0f106c45a8d3d957dee5d33ea550a79 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Move\svariable\sdeclaration\sto\sfix\scompilation\swith\sMSVC.
-D 2012-06-19T04:36:48.907
+C Disable\sthe\satof1.test\smodule\swhen\scompiling\son\sMSVC.
+D 2012-06-21T15:02:26.644
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in d17fddaa4e81f93a7c9c7c0808aacb3fc95f79f4
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -200,7 +200,7 @@ F src/test_async.c 0612a752896fad42d55c3999a5122af10dcf22ad
 F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e
 F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de
 F src/test_btree.c 5b89601dcb42a33ba8b820a6b763cc9cb48bac16
-F src/test_config.c 4f7b8030287d62fe56a1d99e68b41760feae381a
+F src/test_config.c 9b37587750f247186ebeb02a02e8f17c611d1866
 F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
 F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
 F src/test_func.c 3a8dd37c08ab43b76d38eea2836e34a3897bf170
@@ -274,7 +274,7 @@ F test/async2.test c0a9bd20816d7d6a2ceca7b8c03d3d69c28ffb8b
 F test/async3.test d73a062002376d7edc1fe3edff493edbec1fc2f7
 F test/async4.test 1787e3952128aa10238bf39945126de7ca23685a
 F test/async5.test 0dd8701bd588bf6e70c2557a22ae3f22b2567b4c
-F test/atof1.test b765ba6bc09aa6a16234d2d66a71a5079f2a6d8a
+F test/atof1.test 9bf1d25180a2e05fc12ce3940cc8003033642f68
 F test/attach.test 0d112b7713611fdf0340260192749737135fda5f
 F test/attach2.test e54436ed956d3d88bdee61221da59bf3935a0966
 F test/attach3.test d89ccfe4fe6e2b5e368d480fcdfe4b496c54cf4e
@@ -1006,7 +1006,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 963eb24f737f184d5fcdcd92ebf90466f818cfd8
-R f969ff33ef926829900ede45cb301833
-U mistachkin
-Z 0dc9aadbc42938d9910cf216fa3f6f99
+P d45f7a013f05fe7603d5e6d02df0e6bab2c7ffd8
+R e35884badae6d1997ef669d538c5ea6c
+U drh
+Z 9a69b4050bef2b4e8b68607c50525e88

diff --git a/manifest.uuid b/manifest.uuid
index b28390f96e6a76b75aaec7208f67ebbd7c87b8e4..4a21353a923a043fb35cb40fb3b7753a03f14357 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d45f7a013f05fe7603d5e6d02df0e6bab2c7ffd8
\ No newline at end of file
+0f706acfc7181f2714a06b2c232677ebeede3a44
\ No newline at end of file

diff --git a/src/test_config.c b/src/test_config.c
index c04eb99a1007a674d4e25ebc69c822634e139f89..4f7dc64e5caa36bb4a95ca71f78ecbb93607f69f 100644 (file)
--- a/src/test_config.c
+++ b/src/test_config.c
@@ -616,6 +616,21 @@ Tcl_SetVar2(interp, "sqlite_options", "long_double",
     Tcl_LinkVar(interp, "TEMP_STORE", (char *)&(cv_TEMP_STORE),
                 TCL_LINK_INT | TCL_LINK_READ_ONLY);
   }
+
+#ifdef _MSC_VER
+  {
+    static const int cv__MSC_VER = 1;
+    Tcl_LinkVar(interp, "_MSC_VER", (char *)&(cv__MSC_VER),
+                TCL_LINK_INT | TCL_LINK_READ_ONLY);
+  }
+#endif
+#ifdef __GNUC__
+  {
+    static const int cv___GNUC__ = 1;
+    Tcl_LinkVar(interp, "__GNUC__", (char *)&(cv___GNUC__),
+                TCL_LINK_INT | TCL_LINK_READ_ONLY);
+  }
+#endif
 }
 
 

diff --git a/test/atof1.test b/test/atof1.test
index 66e1bee518f0aa0e326e54d8dab35a6c65ea89a8..76eb4273b969041ec9233701c32d68dc10d6dfaa 100644 (file)
--- a/test/atof1.test
+++ b/test/atof1.test
@@ -15,6 +15,11 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+if {![info exists __GNUC__]} {
+  finish_test
+  return
+}
+
 expr srand(1)
 for {set i 1} {$i<20000} {incr i} {
   set pow [expr {int((rand()-0.5)*100)}]
@@ -24,7 +29,7 @@ for {set i 1} {$i<20000} {incr i} {
   # Verify that text->real conversions get exactly same ieee754 floating-
   # point value in SQLite as they do in TCL.
   #
-  do_test 1.$i.1 {
+  do_test atof1-1.$i.1 {
     set y [db eval "SELECT $xf=\$x"]
     if {!$y} {
       puts -nonewline \173[db eval "SELECT real2hex($xf), real2hex(\$x)"]\175
@@ -38,7 +43,7 @@ for {set i 1} {$i<20000} {incr i} {
   # Verify that round-trip real->text->real conversions using the quote()
   # function preserve the bits of the numeric value exactly.
   #
-  do_test 1.$i.2 {
+  do_test atof1-1.$i.2 {
     set y [db eval {SELECT $x=CAST(quote($x) AS real)}]
     if {!$y} {
       db eval {SELECT real2hex($x) a, real2hex(CAST(quote($x) AS real)) b} {}