From: shaneh <shaneh@noemail.net>
Date: Thu, 30 Sep 2010 20:11:24 +0000 (+0000)
Subject: Fix some matching issues in enc4.test affected by TCL versions.
X-Git-Tag: version-3.7.4~122^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a03a0563c1a74c49f6a9a4f6ea8d12f6a8843273;p=thirdparty%2Fsqlite.git

Fix some matching issues in enc4.test affected by TCL versions.

FossilOrigin-Name: dd6d61a967e3c0d98b78987f6f7bb9bdf090174e
---

diff --git a/manifest b/manifest
index d27205cf36..8bc640343f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\smemory\sleak\sin\senc4.test\sscript.
-D 2010-09-30T18:30:18
+C Fix\ssome\smatching\sissues\sin\senc4.test\saffected\sby\sTCL\sversions.
+D 2010-09-30T20:11:24
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -362,7 +362,7 @@ F test/e_vacuum.test 057cc29445746fc1d2542984ff0253d511a234bd
 F test/enc.test e54531cd6bf941ee6760be041dff19a104c7acea
 F test/enc2.test 6d91a5286f59add0cfcbb2d0da913b76f2242398
 F test/enc3.test 5c550d59ff31dccdba5d1a02ae11c7047d77c041
-F test/enc4.test bd6e3543d9a7758edbd1bed0871326f001583418
+F test/enc4.test 4b575ef09e0eff896e73bd24076f96c2aa6a42de
 F test/eval.test bc269c365ba877554948441e91ad5373f9f91be3
 F test/exclusive.test 0ba00fb15aeec1eba3d4b03a271b5081e21c35be
 F test/exclusive2.test 76e63c05349cb70d09d60b99d2ae625525ff5155
@@ -872,7 +872,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P c7f9363617a66ee43a87816ad42aaf2b75f13ea2
-R f57941c58a3f28e9d056eb0ddaa57ab8
+P bfc294ae437e02984c08d47bed7b7fb49b71a1c2
+R 7552db8dcb12c2a18499c922a224a015
 U shaneh
-Z 08306689a2b387b72cdadc0bc128e945
+Z 32c63a4384668fcaade4669548caae85
diff --git a/manifest.uuid b/manifest.uuid
index 128f2f3ab4..d64876130f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bfc294ae437e02984c08d47bed7b7fb49b71a1c2
\ No newline at end of file
+dd6d61a967e3c0d98b78987f6f7bb9bdf090174e
\ No newline at end of file
diff --git a/test/enc4.test b/test/enc4.test
index bf3bea268f..de2a1b88d0 100644
--- a/test/enc4.test
+++ b/test/enc4.test
@@ -63,6 +63,8 @@ foreach enc $encodings {
     foreach val $vals {
       for {set x 1} {$x<18} {incr x} {
         set part [expr $init + [string range $val 0 [expr $x-1]]]
+        regsub {e\+0} $part {e+} part
+        regsub {^1e} $part {1.0e} part
 
         do_test enc4-$i.$j.$k.3.$x {
           sqlite3_reset $S