Use 1<<$x instead of pow(2,$x) in the test suite code. (CVS 4715)

FossilOrigin-Name: 3a289b6d28bcf399845586b15f100d7c3a78b550

diff --git a/manifest b/manifest
index fa3f5cafc8c023cecd044d49ffb25c2e71d47d98..7f563f0edba410cffc4fbd6c669ffacbb496830b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Get\sall\stests\srunning\swithout\smemory\sleaks.\s(CVS\s4714)
-D 2008-01-16T17:46:38
+C Use\s1<<$x\sinstead\sof\spow(2,$x)\sin\sthe\stest\ssuite\scode.\s(CVS\s4715)
+D 2008-01-16T18:20:42
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 30789bf70614bad659351660d76b8e533f3340e9
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -261,7 +261,7 @@ F test/enc3.test 9331988b9d72decec96995c90637e87b00d747a5
 F test/exclusive.test ebaf72ce9ff8f7ab3a09bf8f58fd65393dfff386
 F test/exclusive2.test d13bf66753dca46e61241d35d36ab7c868b0d313
 F test/exclusive3.test 0e49c35b7e7cb8e7280b4ce3f0359d30b207d2ff
-F test/expr.test dc50ec4e69f1168eece91f9c18dcff59b718e44c
+F test/expr.test 31082f3f68aa0d07d1d49088d45ed18f4b792486
 F test/filefmt.test 053b622009fbbb74dd37921ffad374d852c13cd8
 F test/fkey1.test dcb4f28eb22d5141f15161d6bdca9a4f58c95729
 F test/format4.test 1f0cac8ff3895e9359ed87e41aaabee982a812eb
@@ -321,7 +321,7 @@ F test/fuzz_common.tcl ff4bc2dfc465f6878f8e2d819620914365382731
 F test/fuzz_malloc.test 166b58dfd77cc04f6afeeaef0cfc1087abf134d1
 F test/hook.test 3870abead2ee75d2c03585c916256ca8b5584679
 F test/icu.test e6bfae7f625c88fd14df6f540fe835bdfc1e4329
-F test/in.test 87270d14e2dd870da77d178985b43fea4675eb56
+F test/in.test 763a29007a4850d611ac4441bfa488fb9969ad30
 F test/in2.test b1f447f4f0f67e9f83ff931e7e2e30873f9ea055
 F test/in3.test e335959db24d71d6cfdff9553c90ce2b56fb978c
 F test/incrblob.test 854c23b7ff8dd3822f675936b22c094655b3c739
@@ -329,11 +329,11 @@ F test/incrblob_err.test 5273097dc7c97f9b7008423a6ffd5c80d21923cb
 F test/incrvacuum.test 1ed44535e89a0fa10c48c1aa0a3d48ee72bcc733
 F test/incrvacuum2.test a958e378c193c4012cb3787804d863487f1dfad1
 F test/incrvacuum_ioerr.test cb331403b8dea3c5bae6163861ff25037b0df56a
-F test/index.test e65df12bed94b2903ee89987115e1578687e9266
+F test/index.test cbf301cdb2da43e4eac636c3400c2439af1834ad
 F test/index2.test ee83c6b5e3173a3d7137140d945d9a5d4fdfb9d6
 F test/index3.test f66718cd92ce1216819d47e6a156755e4b2c4ca1
 F test/insert.test aef273dd1cee84cc92407469e6bd1b3cdcb76908
-F test/insert2.test 5a20e1ace5fa0800b58d28284212290189b49aed
+F test/insert2.test 4f3a04d168c728ed5ec2c88842e772606c7ce435
 F test/insert3.test 9a4ef3526fd3cca8b05278020ec3100448b4c677
 F test/insert4.test 6919ddacd79c2cfeb9785b0f84217f9cb14853b5
 F test/insert5.test 509017213328147d3acdfa2c441bfd82362dda41
@@ -352,7 +352,7 @@ F test/journal1.test 36f2d1bb9bf03f790f43fbdb439e44c0657fab19
 F test/lastinsert.test 474d519c68cb79d07ecae56a763aa7f322c72f51
 F test/laststmtchanges.test 18ead86c8a87ade949a1d5658f6dc4bb111d1b02
 F test/like.test 2a2cd2d67ea43526b97c001304a6311717331a6a
-F test/limit.test 2a87b9cb2165abb49ca0ddcf5cb43cf24074581f
+F test/limit.test ca61a9fc520f54470edb3a771167fe4b68abc247
 F test/loadext.test 1911e7365a6d31d77ba00dd3a8a31b7f2111a670
 F test/loadext2.test 95ca7e2cb03fd3e068de97c3a2fe58dbdfd769e1
 F test/lock.test 6825aea0b5885578b1b63a3b178803842c4ee9f1
@@ -405,7 +405,7 @@ F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
 F test/printf.test 6bf1a86c6a1e45536f72d782bf44c8e3c76510f8
 F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301 x
 F test/ptrchng.test 38ae1806833d72d9a81a6121322e274f24937e18
-F test/quick.test ab128ce4b4ba34df655291caeaa109695d307d0e
+F test/quick.test 771a6b3a88fdd0e7e813ce013ceda29037bc9462
 F test/quote.test 215897dbe8de1a6f701265836d6601cc6ed103e6
 F test/rdonly.test b34db316525440d3b42c32e83942c02c37d28ef0
 F test/reindex.test 38b138abe36bf9a08c791ed44d9f76cd6b97b78b
@@ -416,9 +416,9 @@ F test/schema.test a8b000723375fd42c68d310091bdbd744fde647c
 F test/schema2.test 35e1c9696443d6694c8980c411497c2b5190d32e
 F test/select1.test 871df931cbbc0e78170605628e8b5fc60765e265
 F test/select2.test f3c2678c3a9f3cf08ec4988a3845bda64be6d9e3
-F test/select3.test 7f99c0d4067064e0865479a56faa7aaa29b9041a
-F test/select4.test 491193f50799e7fdb375ef04a1a8f40393dd7cfe
-F test/select5.test 0b47058d3e916c1fc9fe81f44b438e02bade21ce
+F test/select3.test 2ce595f8fb8e2ac10071d3b4e424cadd4634a054
+F test/select4.test ba1c276ce20376c3bfe682ad8233c0a63fac04c6
+F test/select5.test 5ad14ea338aada2e6394ba98fa9aa40e3e50aec0
 F test/select6.test 399f14b9ba37b768afe5d2cd8c12e4f340a69db8
 F test/select7.test 7906735805cfbee4dddc0bed4c14e68d7f5f9c5f
 F test/select8.test 391de11bdd52339c30580dabbbbe97e3e9a3c79d
@@ -501,7 +501,7 @@ F test/types.test 98e7a631bddf0806204358b452b02d0e319318a6
 F test/types2.test 3555aacf8ed8dc883356e59efc314707e6247a84
 F test/types3.test b730a7db03ef69f0fdb85b2addc20d1a0a04039b
 F test/unique.test 0253c4227a5dc533e312202ce21ecfad18058d18
-F test/update.test 7669ca789d62c258b678e8aa7a22a57eac10f2cf
+F test/update.test 24c1dcc025f7ef352759afe3f4a20e6fdfd43a97
 F test/utf16.test 20e2d9ba0d57e952a18b1ac8deab9ad49e082893
 F test/utf16align.test 7360e84472095518c56746f76b1f9d4dce99fb4d
 F test/vacuum.test 7493b09398d576b69a8b2f55bac92d50a9b8e796
@@ -606,7 +606,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 3aa5606bd4bd750a365454f42ab07826320f5b98
-R c504240cc22c2c769bef9b23e2b21009
-U drh
-Z 8d9f2dc043e5920fdb52614a59dd6687
+P 5807921f5a6e2e08f2c9e79aa91d8c587d64de74
+R 871f72c6ea2165bc803ac14747ee932f
+U danielk1977
+Z b5d54334b931393ae4ef6244d18f48c7

diff --git a/manifest.uuid b/manifest.uuid
index ccc6f6853ce59610979b3af5a0d583c2408612b9..9b37b9fa11577328c40cd1ff072774bad69b8381 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5807921f5a6e2e08f2c9e79aa91d8c587d64de74
\ No newline at end of file
+3a289b6d28bcf399845586b15f100d7c3a78b550
\ No newline at end of file

diff --git a/test/expr.test b/test/expr.test
index 8c2a09b10fdc5e4a7ad4857a65c8ea65874996dc..0f03fd9f6ca1da75feb8cd5ed950c3f63b6c2b04 100644 (file)
--- a/test/expr.test
+++ b/test/expr.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing expressions.
 #
-# $Id: expr.test,v 1.59 2007/09/01 18:24:55 danielk1977 Exp $
+# $Id: expr.test,v 1.60 2008/01/16 18:20:42 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -511,7 +511,7 @@ test_expr expr-case.13 {i1=7} \
 execsql {DROP TABLE test1}
 execsql {CREATE TABLE test1(a int, b int);}
 for {set i 1} {$i<=20} {incr i} {
-  execsql "INSERT INTO test1 VALUES($i,[expr {int(pow(2,$i))}])"
+  execsql "INSERT INTO test1 VALUES($i,[expr {1<<$i}])"
 }
 execsql "INSERT INTO test1 VALUES(NULL,0)"
 do_test expr-7.1 {

diff --git a/test/in.test b/test/in.test
index 6d6af278610f6f69dc1d491fdbc5aea15e56e751..173cd86f70c09ce98fe6041573617de7aeab5d74 100644 (file)
--- a/test/in.test
+++ b/test/in.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing the IN and BETWEEN operator.
 #
-# $Id: in.test,v 1.18 2007/12/13 18:24:22 danielk1977 Exp $
+# $Id: in.test,v 1.19 2008/01/16 18:20:42 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -24,7 +24,7 @@ do_test in-1.0 {
     CREATE TABLE t1(a int, b int);
   }
   for {set i 1} {$i<=10} {incr i} {
-    execsql "INSERT INTO t1 VALUES($i,[expr {int(pow(2,$i))}])"
+    execsql "INSERT INTO t1 VALUES($i,[expr {1<<$i}])"
   }
   execsql {
     COMMIT;

diff --git a/test/index.test b/test/index.test
index 69427e83014bba76909de4083292aa687a235aee..a278ac8889cf535062155ae4bdbc9fe14622e1b7 100644 (file)
--- a/test/index.test
+++ b/test/index.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing the CREATE INDEX statement.
 #
-# $Id: index.test,v 1.42 2006/03/29 00:24:07 drh Exp $
+# $Id: index.test,v 1.43 2008/01/16 18:20:42 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -114,7 +114,7 @@ do_test index-3.3 {
 do_test index-4.1 {
   execsql {CREATE TABLE test1(cnt int, power int)}
   for {set i 1} {$i<20} {incr i} {
-    execsql "INSERT INTO test1 VALUES($i,[expr {int(pow(2,$i))}])"
+    execsql "INSERT INTO test1 VALUES($i,[expr {1<<$i}])"
   }
   execsql {CREATE INDEX index9 ON test1(cnt)}
   execsql {CREATE INDEX indext ON test1(power)}
@@ -221,7 +221,7 @@ integrity_check index-6.5
 do_test index-7.1 {
   execsql {CREATE TABLE test1(f1 int, f2 int primary key)}
   for {set i 1} {$i<20} {incr i} {
-    execsql "INSERT INTO test1 VALUES($i,[expr {int(pow(2,$i))}])"
+    execsql "INSERT INTO test1 VALUES($i,[expr {1<<$i}])"
   }
   execsql {SELECT count(*) FROM test1}
 } {19}

diff --git a/test/insert2.test b/test/insert2.test
index 21bd0b7640861e90e1158d22a066a5bd23bce5b3..6876d538ae5cce42a5da56f4a86f5d92bffc488d 100644 (file)
--- a/test/insert2.test
+++ b/test/insert2.test
@@ -12,7 +12,7 @@
 # focus of this file is testing the INSERT statement that takes is
 # result from a SELECT.
 #
-# $Id: insert2.test,v 1.18 2005/10/05 11:35:09 drh Exp $
+# $Id: insert2.test,v 1.19 2008/01/16 18:20:42 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -22,7 +22,7 @@ source $testdir/tester.tcl
 do_test insert2-1.0 {
   execsql {CREATE TABLE d1(n int, log int);}
   for {set i 1} {$i<=20} {incr i} {
-    for {set j 0} {pow(2,$j)<$i} {incr j} {}
+    for {set j 0} {(1<<$j)<$i} {incr j} {}
     execsql "INSERT INTO d1 VALUES($i,$j)"
   }
   execsql {SELECT * FROM d1 ORDER BY n}

diff --git a/test/limit.test b/test/limit.test
index 636bdf630bf0ba10232dd07f5e87c0157dce013a..206c0b95f57e1d9b6384db209e1eb424a9c58f6c 100644 (file)
--- a/test/limit.test
+++ b/test/limit.test
@@ -12,7 +12,7 @@
 # focus of this file is testing the LIMIT ... OFFSET ... clause
 #  of SELECT statements.
 #
-# $Id: limit.test,v 1.30 2006/06/20 11:01:09 danielk1977 Exp $
+# $Id: limit.test,v 1.31 2008/01/16 18:20:42 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -24,7 +24,7 @@ execsql {
   BEGIN;
 }
 for {set i 1} {$i<=32} {incr i} {
-  for {set j 0} {pow(2,$j)<$i} {incr j} {}
+  for {set j 0} {(1<<$j)<$i} {incr j} {}
   execsql "INSERT INTO t1 VALUES([expr {32-$i}],[expr {10-$j}])"
 }
 execsql {

diff --git a/test/quick.test b/test/quick.test
index 732212dc399f46ae44a654da5b9ae7eb7b12ca80..7c4f371d06fffd436b87b2dcbedcefbdb9394473 100644 (file)
--- a/test/quick.test
+++ b/test/quick.test
@@ -6,7 +6,7 @@
 #***********************************************************************
 # This file runs all tests.
 #
-# $Id: quick.test,v 1.68 2008/01/08 18:57:50 drh Exp $
+# $Id: quick.test,v 1.69 2008/01/16 18:20:42 danielk1977 Exp $
 
 proc lshift {lvar} {
   upvar $lvar l
@@ -111,3 +111,5 @@ source $testdir/misuse.test
 
 set sqlite_open_file_count 0
 really_finish_test
+
+

diff --git a/test/select3.test b/test/select3.test
index 53f8369057dcd28ac9e890ac8bfb1d2d2d9237e0..b5dbef5fb44cef397ef4fa1d84ef076650afd0fa 100644 (file)
--- a/test/select3.test
+++ b/test/select3.test
@@ -12,7 +12,7 @@
 # focus of this file is testing aggregate functions and the
 # GROUP BY and HAVING clauses of SELECT statements.
 #
-# $Id: select3.test,v 1.22 2007/12/13 07:58:51 danielk1977 Exp $
+# $Id: select3.test,v 1.23 2008/01/16 18:20:42 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -25,7 +25,7 @@ do_test select3-1.0 {
     BEGIN;
   }
   for {set i 1} {$i<32} {incr i} {
-    for {set j 0} {pow(2,$j)<$i} {incr j} {}
+    for {set j 0} {(1<<$j)<$i} {incr j} {}
     execsql "INSERT INTO t1 VALUES($i,$j)"
   }
   execsql {

diff --git a/test/select4.test b/test/select4.test
index adbc57104dda8f7b2d30f06d58423717054ef0bf..71feb3e94a6002e79d16a610607d117e594b6d3d 100644 (file)
--- a/test/select4.test
+++ b/test/select4.test
@@ -12,7 +12,7 @@
 # focus of this file is testing UNION, INTERSECT and EXCEPT operators
 # in SELECT statements.
 #
-# $Id: select4.test,v 1.25 2008/01/12 12:48:09 drh Exp $
+# $Id: select4.test,v 1.26 2008/01/16 18:20:42 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -29,7 +29,7 @@ execsql {
   BEGIN;
 }
 for {set i 1} {$i<32} {incr i} {
-  for {set j 0} {pow(2,$j)<$i} {incr j} {}
+  for {set j 0} {(1<<$j)<$i} {incr j} {}
   execsql "INSERT INTO t1 VALUES($i,$j)"
 }
 execsql {

diff --git a/test/select5.test b/test/select5.test
index fe53c7273e5bbd6d09e2b436524eb59ba37500e1..1fa0ec63d72ebacaf49112addf805513472bc272 100644 (file)
--- a/test/select5.test
+++ b/test/select5.test
@@ -12,7 +12,7 @@
 # focus of this file is testing aggregate functions and the
 # GROUP BY and HAVING clauses of SELECT statements.
 #
-# $Id: select5.test,v 1.16 2006/01/21 12:08:55 danielk1977 Exp $
+# $Id: select5.test,v 1.17 2008/01/16 18:20:42 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -24,7 +24,7 @@ execsql {
   BEGIN;
 }
 for {set i 1} {$i<32} {incr i} {
-  for {set j 0} {pow(2,$j)<$i} {incr j} {}
+  for {set j 0} {(1<<$j)<$i} {incr j} {}
   execsql "INSERT INTO t1 VALUES([expr {32-$i}],[expr {10-$j}])"
 }
 execsql {

diff --git a/test/update.test b/test/update.test
index d56c342a91b680fa2da2ab49b7a690e6158a52f2..89ebab4f2df8ccd93c8882c93cf2e61334e4a2da 100644 (file)
--- a/test/update.test
+++ b/test/update.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing the UPDATE statement.
 #
-# $Id: update.test,v 1.17 2005/01/21 03:12:16 danielk1977 Exp $
+# $Id: update.test,v 1.18 2008/01/16 18:20:42 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -36,7 +36,7 @@ do_test update-2.1 {
 do_test update-3.1 {
   execsql {CREATE TABLE test1(f1 int,f2 int)}
   for {set i 1} {$i<=10} {incr i} {
-    set sql "INSERT INTO test1 VALUES($i,[expr {int(pow(2,$i))}])"
+    set sql "INSERT INTO test1 VALUES($i,[expr {1<<$i}])"
     execsql $sql
   }
   execsql {SELECT * FROM test1 ORDER BY f1}