Fix a test script error causing tests to fail in soak.test.

FossilOrigin-Name: 462b52b121c1882e0eca819bc30c0f6e94d7fdd60047d2c32adeff3a1eb70546

diff --git a/manifest b/manifest
index cb3e447750eee499b0be302c5cf6b58742218612..71e96eabe037d184b84f2d12f95ddfadf5caa9c9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sthe\scomments\sin\sthe\stemplatevtab.c\simplementation.
-D 2018-04-27T15:17:08.924
+C Fix\sa\stest\sscript\serror\scausing\stests\sto\sfail\sin\ssoak.test.
+D 2018-04-27T16:35:44.321
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 5ce9343cba9c189046f1afe6d2bcc1f68079439febc05267b98aec6ecc752439
@@ -938,7 +938,7 @@ F test/fuzz.test 96083052bf5765e4518c1ba686ce2bab785670d1
 F test/fuzz2.test 76dc35b32b6d6f965259508508abce75a6c4d7e1
 F test/fuzz3.test 9c813e6613b837cb7a277b0383cd66bfa07042b4cf0317157c35852f30043c31
 F test/fuzz_common.tcl a87dfbb88c2a6b08a38e9a070dabd129e617b45b
-F test/fuzz_malloc.test cf82eab3d93cd3e38b2d53c13c6739ff4cd5b1c31c2c45edd0bcee78e7060c2b
+F test/fuzz_malloc.test 5b257a7652d8ee90b22e9cf80d9dbea31a4f3e6fed1d33de57b24b1bdb211d79
 F test/fuzzcheck.c 5eb86c6ac96833ee622f45bf47e8045999c1b4b10d05e4eb809894a4b39f2f84
 F test/fuzzdata1.db 7ee3227bad0e7ccdeb08a9e6822916777073c664
 F test/fuzzdata2.db f03a420d3b822cc82e4f894ca957618fbe9c4973
@@ -1257,7 +1257,7 @@ F test/snapshot.test 85735bd997a4f6d710140c28fd860519a299649f
 F test/snapshot2.test 925e42427e923262db63c9d7155183f889e3e99feaedec4075f659e51608344f
 F test/snapshot3.test 9719443594a04778861bd20d12596c5f880af177d6cd62f111da3198cafc6096
 F test/snapshot_fault.test 52c5e97ebd218846a8ae2da4d147d3e77d71f963
-F test/soak.test 0b5b6375c9f4110c828070b826b3b4b0bb65cd5f
+F test/soak.test 18944cf21b94a7fe0df02016a6ee1e9632bc4e8d095a0cb49d95e15d5cca2d5c
 F test/softheap1.test 843cd84db9891b2d01b9ab64cef3e9020f98d087
 F test/sort.test c2adc635c2564241fefec0b3a68391ef6868fd3b
 F test/sort2.test cc23b7c19d684657559e8a55b02f7fcee03851d0
@@ -1725,7 +1725,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 9fd0faf517993587d2f54212638545fc85fbbc84a031bcfae8c1e5894825d83b
-R 408ce2695c1a501e1640fcd4bee57806
-U drh
-Z 4384bff1ecbee30802e6ddd37b479122
+P 05f6278a02e5cde89f76ced5af7d508e26576d7291dad7ee9e06b1a3be516cb0
+R ce6b5d477950780636718aaaaed16610
+U dan
+Z 1e8f0b656d8a36cb9e04758d22e86e0c

diff --git a/manifest.uuid b/manifest.uuid
index 839311ed430fdba57480ad611aa7d56a15d382f2..b2a304a8d4496297b453a3a7471693d7be39f821 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-05f6278a02e5cde89f76ced5af7d508e26576d7291dad7ee9e06b1a3be516cb0
\ No newline at end of file
+462b52b121c1882e0eca819bc30c0f6e94d7fdd60047d2c32adeff3a1eb70546
\ No newline at end of file

diff --git a/test/fuzz_malloc.test b/test/fuzz_malloc.test
index b01b9d7ae44eec753ea40a84146d8b16136d9ad4..531da55c1a40e4afd92e5302c2a737ad6df3434f 100644 (file)
--- a/test/fuzz_malloc.test
+++ b/test/fuzz_malloc.test
@@ -57,10 +57,16 @@ proc do_fuzzy_malloc_test {testname args} {
     incr jj
     set ::sql [subst $::fuzzyopts(-template)]
     # puts fuzyy-sql=\[$::sql\]; flush stdout
-    foreach {rc res} [catchsql "$::sql"] {}
+    foreach {rc ::fmtres} [catchsql "$::sql"] {}
     if {$rc==0} {
       set nErr1 [set_test_counter errors]
-      do_malloc_test $testname-$ii -sqlbody $::sql -sqlprep $::prep
+      do_faultsim_test $testname-$ii -faults oom* -body {
+        execsql $::sql
+      } -test {
+        if {$testrc && $testresult!="datatype mismatch"} { 
+          faultsim_test_result {0 {}}
+        }
+      }
       if {[set_test_counter errors]>$nErr1} {
         puts "Previous fuzzy-sql=\[$::sql\]"
         flush stdout

diff --git a/test/soak.test b/test/soak.test
index c457dec4a957a44b6daafc43c4944554449b2ea6..e8535a1456b0c3ab3bfc3d7e9ae3335f5de434b0 100644 (file)
--- a/test/soak.test
+++ b/test/soak.test
@@ -67,12 +67,12 @@ set SOAKTESTS {
 
 set G(isquick) 1
 
-set soak_starttime  [clock seconds]
+set soak_starttime  [clock_seconds]
 set soak_finishtime [expr {$soak_starttime + $TIMEOUT}]
 
 # Loop until the timeout is reached or an error occurs.
 #
-for {set iRun 0} {[clock seconds] < $soak_finishtime} {incr iRun} {
+for {set iRun 0} {[clock_seconds] < $soak_finishtime} {incr iRun} {
 
   set iIdx [expr {$iRun % [llength $SOAKTESTS]}]
   source [file join $testdir [lindex $SOAKTESTS $iIdx]]