From d0b2677b78aad567ccfef852ced3d3cc05cc67b5 Mon Sep 17 00:00:00 2001 From: drh Date: Mon, 3 May 2010 19:20:46 +0000 Subject: [PATCH] Unset some global TCL variables prior to use in test where prior tests can have those same variables set to an array value. FossilOrigin-Name: 49bef00e5cda600ceb964148bf745de4aff1ab62 --- manifest | 20 ++++++++++---------- manifest.uuid | 2 +- test/table.test | 1 + test/walthread.test | 1 + 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/manifest b/manifest index e88f633f96..ba3ac27d74 100644 --- a/manifest +++ b/manifest @@ -1,8 +1,8 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -C Fix\sa\sbug\sin\sthe\scomputation\sof\sthe\scurrent\stime\sfor\sthe\salternative\nCURRENT_TIMESTAMP\sfunctions\sused\swhen\sSQLITE_OMIT_DATETIME\sis\sdefined. -D 2010-05-03T19:17:01 +C Unset\ssome\sglobal\sTCL\svariables\sprior\sto\suse\sin\stest\swhere\sprior\stests\scan\nhave\sthose\ssame\svariables\sset\sto\san\sarray\svalue. +D 2010-05-03T19:20:47 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in d83a0ffef3dcbfb08b410a6c6dd6c009ec9167fb F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -600,7 +600,7 @@ F test/subquery.test b524f57c9574b2c0347045b4510ef795d4686796 F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4 F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a F test/sync.test ded6b39d8d8ca3c0c5518516c6371b3316d3e3a3 -F test/table.test bf102a5669c4db7a41330802f24a4a81a4204f83 +F test/table.test 04ba066432430657712d167ebf28080fe878d305 F test/tableapi.test 7262a8cbaa9965d429f1cbd2747edc185fa56516 F test/tclsqlite.test 013133fa83128569c6fb8a7a48dc7c4507e6ff1c F test/tempdb.test 1bf52da28a9c24e29717362a87722dff08feb72b @@ -768,7 +768,7 @@ F test/walfault.test cdd1a27ed89bcb14596005ab2477b3724dd5f805 F test/walhook.test 5f18e0fc8787f1f8889d7a9971af18f334f83786 F test/walmode.test bac6f06544a8554588a1543def996bbe2fc41792 F test/walslow.test d21625e2e99e11c032ce949e8a94661576548933 -F test/walthread.test bc612c04c2a3292bf988f080298f5dd2bafb913f +F test/walthread.test 08f553f38b99ad0fb96d188c175808df9dc5f790 F test/where.test de337a3fe0a459ec7c93db16a519657a90552330 F test/where2.test 43d4becaf5a5df854e6c21d624a1cb84c6904554 F test/where3.test aa44a9b29e8c9f3d7bb94a3bb3a95b31627d520d @@ -812,14 +812,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P 313762427d96954667909887a797ea996dc6304a -R 7bdbd648f5b941a1b7af481017022cae +P e7ded46b5efabe521008d9043dd72bd1ca748316 +R 743eb58d4aa3ebab274cf42a45b64c62 U drh -Z 11ea5e9f20105717e49fcdc4088a48fa +Z 52a27cb9451578dbe5d554c4411d8300 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFL3yEwoxKgR168RlERAt9FAJwKEESFjDM1Jdcqt8QB2dixGkdQwACcCNox -ZyQy8yYFMU+Da4OcsseBydQ= -=mdHz +iD8DBQFL3yIToxKgR168RlERAngrAJwPIAkaDM8Usma0OrWE695X+1LPGgCdEAoZ +GermSXszjhToHNBo5iA+oE8= +=sr8r -----END PGP SIGNATURE----- diff --git a/manifest.uuid b/manifest.uuid index bff6f4f4f4..d25f2ed7c8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e7ded46b5efabe521008d9043dd72bd1ca748316 \ No newline at end of file +49bef00e5cda600ceb964148bf745de4aff1ab62 \ No newline at end of file diff --git a/test/table.test b/test/table.test index 173a62a25e..5fa9116656 100644 --- a/test/table.test +++ b/test/table.test @@ -604,6 +604,7 @@ do_test table-13.1 { } } {} set i 0 +unset -nocomplain date time seconds foreach {date time seconds} { 1976-07-04 12:00:00 205329600 1994-04-16 14:00:00 766504800 diff --git a/test/walthread.test b/test/walthread.test index 1e5a4ad096..620f8f220f 100644 --- a/test/walthread.test +++ b/test/walthread.test @@ -508,5 +508,6 @@ do_thread_test walthread-5 -seconds $seconds(walthread-5) -init { } -thread T 5 { db eval { SELECT count(*) FROM t1 } } +unset -nocomplain seconds finish_test