Added limited support to omittest.tcl for nmake makefile.

FossilOrigin-Name: f5f46dc7b8c23e77fd1ff792b7d0cf070de47ca3

diff --git a/manifest b/manifest
index 3612534c1fc42ac59a6773dfa49d74e7b28dd495..72883e03d5d57ca24cc543677964974d8d9c2676 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sa\stest\scase\sfor\sWindows\sthat\sfailed\sbecause\sof\ssize_hint\simplementation\sdifferences.
-D 2011-06-22T15:40:19.354
+C Added\slimited\ssupport\sto\somittest.tcl\sfor\snmake\smakefile.
+D 2011-06-22T20:14:09.429
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -923,7 +923,7 @@ F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 F tool/mksqlite3c.tcl 1fa0ed9cfdc768bf5de7e65fda8d97a46dd2a7e6
 F tool/mksqlite3h.tcl 78013ad79a5e492e5f764f3c7a8ef834255061f8
 F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87
-F tool/omittest.tcl b1dd290c1596e0f31fd335160a74ec5dfea3df4a
+F tool/omittest.tcl 8086c014cbae90f1f2b564d59d05a5e4ac1783c9
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
 F tool/restore_jrnl.tcl 6957a34f8f1f0f8285e07536225ec3b292a9024a
 F tool/rollback-test.c 9fc98427d1e23e84429d7e6d07d9094fbdec65a5
@@ -948,7 +948,7 @@ F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00
 F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d
-P 13e96376e11d71d203f7b67c12272e8762200876
-R 0f9edd221a28a4b18bfff2393e67da75
+P f853fa63c357b78f93e553eb81cd79d4c3e06850
+R ddc3e17983db538a7697328fd62bb1d7
 U shaneh
-Z 89c72c5e482a74abfd113068f7363d86
+Z 53ee1769a28d0b67b6ec5c95bb5607ec

diff --git a/manifest.uuid b/manifest.uuid
index 65bfddf1035b58f12f725f86869024113f31663a..467483d7d728fde7abd621c02575f8863d54b9b4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f853fa63c357b78f93e553eb81cd79d4c3e06850
\ No newline at end of file
+f5f46dc7b8c23e77fd1ff792b7d0cf070de47ca3
\ No newline at end of file

diff --git a/tool/omittest.tcl b/tool/omittest.tcl
index f1963ff13dd005c80f6cfc6a88adc1deb0479701..33a71cee26ddef8aff128cf7e9279c458092b8d8 100644 (file)
--- a/tool/omittest.tcl
+++ b/tool/omittest.tcl
@@ -31,8 +31,8 @@ should work. The following properties are required:
 
 More precisely, the following two invocations must be supported:
 
-  make -f $::MAKEFILE testfixture OPTS="-DSQLITE_OMIT_ALTERTABLE=1"
-  make -f $::MAKEFILE test
+  $::MAKEBIN -f $::MAKEFILE testfixture OPTS="-DSQLITE_OMIT_ALTERTABLE=1"
+  $::MAKEBIN -f $::MAKEFILE test
 
 Makefiles generated by the sqlite configure program cannot be used as
 they do not respect the OPTS variable.
@@ -73,7 +73,7 @@ catch {
   file copy -force ./libtool $dir
 }
   set rc [catch {
-    exec make -C $dir -f $::MAKEFILE $target OPTS=$opts >& $dir/build.log
+    exec $::MAKEBIN -C $dir -f $::MAKEFILE clean $target OPTS=$opts >& $dir/build.log
   }]
   if {$rc} {
     puts "No good. See $dir/build.log."
@@ -102,7 +102,7 @@ catch {
     puts -nonewline "Testing $dir..."
     flush stdout
     set rc [catch {
-      exec make -C $dir -f $::MAKEFILE test OPTS=$opts >& $dir/test.log
+      exec $::MAKEBIN -C $dir -f $::MAKEFILE test OPTS=$opts >& $dir/test.log
     }]
     if {$rc} {
       puts "No good. See $dir/test.log."
@@ -119,8 +119,9 @@ catch {
 # option.
 #
 proc process_options {argv} {
+  set ::MAKEBIN make                        ;# Default value
   if {$::tcl_platform(platform)=="windows" || $::tcl_platform(platform)=="os2"} {
-    set ::MAKEFILE ./Makefile               ;# Default value
+    set ::MAKEFILE ./Makefile               ;# Default value on Windows and OS2
   } else {
     set ::MAKEFILE ./Makefile.linux-gcc     ;# Default value
   }
@@ -133,6 +134,11 @@ proc process_options {argv} {
         set ::MAKEFILE [lindex $argv $i]
       }
   
+      -nmake {
+        set ::MAKEBIN nmake
+        set ::MAKEFILE ./Makefile.msc
+      }
+
       -skip_run {
         set ::SKIP_RUN 1
       }
@@ -251,7 +257,7 @@ proc main {argv} {
       exit -1
     }
 
-    set dirname "test_[string range $sym 7 end]"
+    set dirname "test_[regsub -nocase {^x*SQLITE_} $sym {}]"
     run_quick_test $dirname $sym
   } else {
     # First try a test with all OMIT symbols except SQLITE_OMIT_FLOATING_POINT 
@@ -270,14 +276,14 @@ proc main {argv} {
     # are the OMIT_FLOATING_POINT and OMIT_PRAGMA symbols, even though we
     # know they will fail. It's good to be reminded of this from time to time.
     foreach sym $::OMIT_SYMBOLS {
-      set dirname "test_[string range $sym 7 end]"
+      set dirname "test_[regsub -nocase {^x*SQLITE_} $sym {}]"
       run_quick_test $dirname $sym
     }
   
     # Try the ENABLE/DISABLE symbols one at a time.  
     # We don't do them all at once since some are conflicting.
     foreach sym $::ENABLE_SYMBOLS {
-      set dirname "test_[string range $sym 7 end]"
+      set dirname "test_[regsub -nocase {^x*SQLITE_} $sym {}]"
       run_quick_test $dirname $sym
     }
   }