From bd0c0014054c596c83908791bce18103db9458f3 Mon Sep 17 00:00:00 2001
From: dan <dan@noemail.net>
Date: Mon, 19 Jul 2010 05:27:17 +0000
Subject: [PATCH] Enable previously failing tests in e_expr.test that pass
 following [3e5975aa3b].

FossilOrigin-Name: 3d59c54a39c4c3149bf01063a91c3db35ec84b31
---
 manifest         | 24 +++++++-----------------
 manifest.uuid    |  2 +-
 test/e_expr.test | 12 +-----------
 3 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/manifest b/manifest
index 5aeece67b9..ac3ed9899c 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C Fix\sa\sparser\sbug\sthat\swas\scausing\sthe\srelative\sprecedence\sof\sLIKE\sand\s<\noperators\sto\sbe\sincorrect.
-D 2010-07-19T02:30:33
+C Enable\spreviously\sfailing\stests\sin\se_expr.test\sthat\spass\sfollowing\s[3e5975aa3b].
+D 2010-07-19T05:27:18
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -343,7 +340,7 @@ F test/descidx2.test 9f1a0c83fd57f8667c82310ca21b30a350888b5d
 F test/descidx3.test fe720e8b37d59f4cef808b0bf4e1b391c2e56b6f
 F test/diskfull.test 0cede7ef9d8f415d9d3944005c76be7589bb5ebb
 F test/distinctagg.test 1a6ef9c87a58669438fc771450d7a72577417376
-F test/e_expr.test 68532b32ca29cf399bbb951f46a906c452ada668
+F test/e_expr.test 141e53fea525bce4f5403fcb0067b88e64fec5eb
 F test/e_fkey.test 6721a741c6499b3ab7e5385923233343c8f1ad05
 F test/e_fts3.test 75bb0aee26384ef586165e21018a17f7cd843469
 F test/enc.test e54531cd6bf941ee6760be041dff19a104c7acea
@@ -840,14 +837,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P a2eaf8294f6d3fb39548987d632e934bb5d71cc9
-R 3680b1404aa2a47c15810101407727f9
-U drh
-Z 036a396808eac88f29ab0c901a24a952
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFMQ7jNoxKgR168RlERAqYgAKCD9FrSdpOxRXyGm2dHWmXrPnrs2gCeMGTK
-mT463GAODKMY6BLAq9Hgffk=
-=ALAu
------END PGP SIGNATURE-----
+P 3e5975aa3bb9df9e1f954bcce99384e0f13cb453
+R 70e259e7c9124a680075accbca8e9ac0
+U dan
+Z 4442afa27e00d12db3352013b9fcc5ac
diff --git a/manifest.uuid b/manifest.uuid
index 76738bda43..3a61dbefc9 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3e5975aa3bb9df9e1f954bcce99384e0f13cb453
\ No newline at end of file
+3d59c54a39c4c3149bf01063a91c3db35ec84b31
\ No newline at end of file
diff --git a/test/e_expr.test b/test/e_expr.test
index c9edaebfce..2ca5ac7498 100644
--- a/test/e_expr.test
+++ b/test/e_expr.test
@@ -78,13 +78,6 @@ db func regexp -argcount 2 regexfunc
 # precedence as =.
 #
 
-
-# TODO: These tests are currently omitted because one or two cases
-# related to LIKE/GLOB/MATCH/REGEXP fail. After this case is fixed,
-# reinstate these tests.
-#
-if 0 {
-
 unset -nocomplain untested
 foreach op1 $oplist {
   foreach op2 $oplist {
@@ -126,9 +119,8 @@ foreach op1 $oplist {
       set a3 [db one $sql3]
 
       do_execsql_test $testname $sql1 [list [
-        expr {$opprec($op2) < $opprec($op1) ? $a3 : $a2}
+        if {$opprec($op2) < $opprec($op1)} {set a3} {set a2}
       ]]
-
       if {$a2 != $a3} { unset -nocomplain untested($op1,$op2) }
     }
   }
@@ -169,8 +161,6 @@ do_execsql_test e_expr-1.6 {
   SELECT 0 == 0 < 2,   (0 == 0) < 2,   0 == (0 < 2)
 } {0 1 0}
 
-}
-
 #-------------------------------------------------------------------------
 # Check that the four unary prefix operators mentioned in the 
 # documentation exist.
-- 
2.47.2