Test script fixes to get things running under varying configurations.

No changes to code. (CVS 4378)

FossilOrigin-Name: 340a6d09bcde11065c1887b84bb81805b523ffb6

diff --git a/manifest b/manifest
index 00740a2b24b9fb5cb395803872bc43b945f59347..ecf9d95ec8f4f3fc51bb4925194efe53b08ad2b1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sthe\slast\straces\sof\sSQLITE_ENABLE_REDEF_IO.\s(CVS\s4377)
-D 2007-09-03T15:26:21
+C Test\sscript\sfixes\sto\sget\sthings\srunning\sunder\svarying\sconfigurations.\nNo\schanges\sto\scode.\s(CVS\s4378)
+D 2007-09-03T15:42:48
 F Makefile.in bfcc303429a5d9dcd552d807ee016c77427418c3
 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -306,7 +306,7 @@ F test/func.test 71b39d44a0dffe123145b7c2973e8c4fb8a67ffd
 F test/fuzz.test 62fc19dd36a427777fd671b569df07166548628a
 F test/fuzz2.test ea38692ce2da99ad79fe0be5eb1a452c1c4d37bb
 F test/fuzz_common.tcl ff4bc2dfc465f6878f8e2d819620914365382731
-F test/fuzz_malloc.test 4a4ab73c1a15cd1f3568890afd4ef9e800388c2f
+F test/fuzz_malloc.test 166b58dfd77cc04f6afeeaef0cfc1087abf134d1
 F test/hook.test 7e7645fd9a033f79cce8fdff151e32715e7ec50a
 F test/icu.test e6bfae7f625c88fd14df6f540fe835bdfc1e4329
 F test/in.test 369cb2aa1eab02296b4ec470732fe8c131260b1d
@@ -344,7 +344,7 @@ F test/lock.test 6825aea0b5885578b1b63a3b178803842c4ee9f1
 F test/lock2.test 5f9557b775662c2a5ee435378f39e10d64f65cb3
 F test/lock3.test 615111293cf32aa2ed16d01c6611737651c96fb9
 F test/lock4.test 49e22396b9be6e047b3d35469f233be79153c9d5
-F test/main.test 913427b847c6cfba055c9d0629f7479f51ba1a48
+F test/main.test 05f585bb70c05caac3e047903b517cbb319ed204
 F test/malloc.test bb1c95fb536cfefd3a5b4ce8ca1d4c99e73b1e33
 F test/malloc2.test c1a74f46a3581b56df29ff46a4e1c99b41c44ad9
 F test/malloc3.test 39b72b04436a81e0c3d548d195f8bdbf1ebf4b52
@@ -569,7 +569,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 020a2b10d408f51d4ef3211c5f701f5378fd4625
-R dd888c3eb00d5288441bd185de933461
+P 38dff76ddf0ec7d2cd0d2e1282f9c36558e5661a
+R efd0ff82d5940d7eeec257455d4f7a8f
 U drh
-Z cd566d270e089965d6607a571009ad25
+Z 4bb62e482335066851b26278d8f0a329

diff --git a/manifest.uuid b/manifest.uuid
index 77f71aac90fff1e59a9f17c1729ecfa8c063bed9..c0c847b6d370bb946f590b9f453ad86bdd60467c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-38dff76ddf0ec7d2cd0d2e1282f9c36558e5661a
\ No newline at end of file
+340a6d09bcde11065c1887b84bb81805b523ffb6
\ No newline at end of file

diff --git a/test/fuzz_malloc.test b/test/fuzz_malloc.test
index 6a54c18150134f9ce9e457793b5c869a2985b637..2d78807cc0de15ae16e864fb357343ba93d42a06 100644 (file)
--- a/test/fuzz_malloc.test
+++ b/test/fuzz_malloc.test
@@ -12,11 +12,16 @@
 #
 # This file tests malloc failures in concert with fuzzy SQL generation.
 #
-# $Id: fuzz_malloc.test,v 1.8 2007/08/30 11:48:32 danielk1977 Exp $
+# $Id: fuzz_malloc.test,v 1.9 2007/09/03 15:42:48 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !memdebug {
+  finish_test
+  return
+}
+
 source $testdir/malloc_common.tcl
 source $testdir/fuzz_common.tcl
 

diff --git a/test/main.test b/test/main.test
index c788164cde768970483d1821980ec5d33e6fa581..00aa96af0b6d37191187f2b85af18d63709f3441 100644 (file)
--- a/test/main.test
+++ b/test/main.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is exercising the code in main.c.
 #
-# $Id: main.test,v 1.26 2007/09/01 09:02:54 danielk1977 Exp $
+# $Id: main.test,v 1.27 2007/09/03 15:42:48 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -317,40 +317,44 @@ do_test main-3.6 {
 
 # The following test-case tests the linked list code used to manage
 # sqlite3_vfs structures.
-do_test main-4.1 {
-  sqlite3_crash_enable 1
-  sqlite3_crash_enable 0
-
-  sqlite3async_enable 1
-  sqlite3async_enable 0
-
-  sqlite3_crash_enable 1
-  sqlite3async_enable 1
-  sqlite3_crash_enable 0
-  sqlite3async_enable 0
-
-  sqlite3_crash_enable 1
-  sqlite3async_enable 1
-  sqlite3async_enable 0
-  sqlite3_crash_enable 0
-
-  sqlite3async_enable 1
-  sqlite3_crash_enable 1
-  sqlite3_crash_enable 0
-  sqlite3async_enable 0
-
-  sqlite3async_enable 1
-  sqlite3_crash_enable 1
-  sqlite3async_enable 0
-  sqlite3_crash_enable 0
-} {}
-do_test main-4.2 {
-  set rc [catch {sqlite3 db test.db -vfs crash} msg]
-  list $rc $msg
-} {1 {no such vfs: crash}}
-do_test main-4.3 {
-  set rc [catch {sqlite3 db test.db -vfs async} msg]
-  list $rc $msg
-} {1 {no such vfs: async}}
-
+if {$::tcl_platform(platform)=="unix"} {
+  ifcapable threadsafe {
+    do_test main-4.1 {
+      sqlite3_crash_enable 1
+      sqlite3_crash_enable 0
+    
+      sqlite3async_enable 1
+      sqlite3async_enable 0
+    
+      sqlite3_crash_enable 1
+      sqlite3async_enable 1
+      sqlite3_crash_enable 0
+      sqlite3async_enable 0
+    
+      sqlite3_crash_enable 1
+      sqlite3async_enable 1
+      sqlite3async_enable 0
+      sqlite3_crash_enable 0
+    
+      sqlite3async_enable 1
+      sqlite3_crash_enable 1
+      sqlite3_crash_enable 0
+      sqlite3async_enable 0
+    
+      sqlite3async_enable 1
+      sqlite3_crash_enable 1
+      sqlite3async_enable 0
+      sqlite3_crash_enable 0
+    } {}
+    do_test main-4.2 {
+      set rc [catch {sqlite3 db test.db -vfs crash} msg]
+      list $rc $msg
+    } {1 {no such vfs: crash}}
+    do_test main-4.3 {
+      set rc [catch {sqlite3 db test.db -vfs async} msg]
+      list $rc $msg
+    } {1 {no such vfs: async}}
+  }
+}
+    
 finish_test