From 09df9e28e53c2d51c6d4e5fd6fcdb5aaa8cedc06 Mon Sep 17 00:00:00 2001 From: drh Date: Sun, 13 Aug 2006 18:43:54 +0000 Subject: [PATCH] Vtab2.test script works regardless of what TCL version is used. (CVS 3350) FossilOrigin-Name: 6df3f6761a16ac5a02152f3c7f0c0e4944112ada --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/vtab2.test | 14 ++++++-------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/manifest b/manifest index fdcb076343..e1c91b0dc4 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Compile\sin\stest\scode\swhenever\s-DSQLITE_TEST=1\sis\spresent.\s\sDo\snot\srely\non\s-DSQLITE_DEBUG=1\sbecause\ssomebody\smight\stry\sto\srun\sthe\stests\swithout\sit.\s(CVS\s3349) -D 2006-08-13T18:39:26 +C Vtab2.test\sscript\sworks\sregardless\sof\swhat\sTCL\sversion\sis\sused.\s(CVS\s3350) +D 2006-08-13T18:43:55 F Makefile.in 9c2a76055c305868cc5f5b73e29a252ff3632c0a F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -295,7 +295,7 @@ F test/vacuum2.test 5aea8c88a65cb29f7d175296e7c819c6158d838c F test/varint.test ab7b110089a08b9926ed7390e7e97bdefeb74102 F test/view.test 16e2774fe35e47a07ac4471b7f0bcc948b1aa6d5 F test/vtab1.test c794695b32fe9428ef1087281374e2a1e6044df2 -F test/vtab2.test bd6d6f3dc0403f42a63a63e3319e0a689d27dd4f +F test/vtab2.test a025a21c2f7d29d9635b30490a8fb1961095b3dc F test/vtab3.test f38d6d7d19f08bffdadce4d5b8cba078f8118587 F test/vtab4.test 4b4293341443839ef6dc02f8d9e614702a6c67ff F test/vtab5.test 9fb8f335651afe8f870011e2f68e5b00c5ad03cd @@ -377,7 +377,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 -P 85434a4b96389359a15556551cdc72259fc505e8 -R a059c4b4cac6c1b282cab53f8fba2604 +P 867defe32873ce82b6e1f5ddb8ad12178f2d76d6 +R 10309f6475890ae53aa0abb8bbf23f75 U drh -Z be0950499a88a5bf353c223f4acee36d +Z d91510d341360efc878c541625fb7e42 diff --git a/manifest.uuid b/manifest.uuid index 7e11ce2800..2ce37c58ba 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -867defe32873ce82b6e1f5ddb8ad12178f2d76d6 \ No newline at end of file +6df3f6761a16ac5a02152f3c7f0c0e4944112ada \ No newline at end of file diff --git a/test/vtab2.test b/test/vtab2.test index 185db297ab..005a49ab23 100644 --- a/test/vtab2.test +++ b/test/vtab2.test @@ -10,7 +10,7 @@ #*********************************************************************** # This file implements regression tests for SQLite library. # -# $Id: vtab2.test,v 1.4 2006/06/27 12:25:00 danielk1977 Exp $ +# $Id: vtab2.test,v 1.5 2006/08/13 18:43:55 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl @@ -53,18 +53,16 @@ do_test vtab2-2.2 { SELECT * FROM vars WHERE name='A'; } } [list A 1 1 A 2 4 A 3 9] +set result {} +foreach var [lsort [info vars tcl_*]] { + catch {lappend result $var [set $var]} +} do_test vtab2-2.3 { execsql { SELECT name, value FROM vars WHERE name MATCH 'tcl_*' AND arrayname = '' ORDER BY name; } -} [list \ - tcl_patchLevel $tcl_patchLevel \ - tcl_pkgPath $tcl_pkgPath \ - tcl_precision $tcl_precision \ - tcl_version $tcl_version \ -] +} $result finish_test -