Fix a bug in the permutations.test script.

FossilOrigin-Name: 3b20ad03be55613d922d81aec5313327bf4098b9

diff --git a/manifest b/manifest
index d490b0d92dc9a96c3e01853f8845a37dae8eb471..8898ef16ec6a424798d257582bc14448998a0f2e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sassert\sin\spager.c.\sAnd\svarious\stest\scases\sthat\sfail\swith\sthe\sin-memory\sjournal\spermutation.
-D 2010-07-03T13:50:12
+C Fix\sa\sbug\sin\sthe\spermutations.test\sscript.
+D 2010-07-03T13:59:01
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -543,7 +543,7 @@ F test/pageropt.test 8146bf448cf09e87bb1867c2217b921fb5857806
 F test/pagesize.test 76aa9f23ecb0741a4ed9d2e16c5fa82671f28efb
 F test/pcache.test 4118a183908ecaed343a06fcef3ba82e87e0129d
 F test/pcache2.test 0d85f2ab6963aee28c671d4c71bec038c00a1d16
-F test/permutations.test 371507d1c5ee8ce60d5dc7d0c16618c2c7c9ee4a
+F test/permutations.test ed03346f6c99678689f56ec89e36263afda5380b
 F test/pragma.test a869b428b861f9dbbdb25461a104e8e830fc3026
 F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
 F test/printf.test 05970cde31b1a9f54bd75af60597be75a5c54fea
@@ -615,7 +615,7 @@ F test/tclsqlite.test 8c154101e704170c2be10f137a5499ac2c6da8d3
 F test/tempdb.test 800c36623d67a2ad1f58784b9c5644e0405af6e6
 F test/temptable.test f42121a0d29a62f00f93274464164177ab1cc24a
 F test/temptrigger.test b0273db072ce5f37cf19140ceb1f0d524bbe9f05
-F test/tester.tcl b533b875487f9ebb5fa9d60dfea9220c2fdfa9d0
+F test/tester.tcl 384eceb0736b84e178766b0876bcf4753eb4cb22
 F test/thread001.test a3e6a7254d1cb057836cb3145b60c10bf5b7e60f
 F test/thread002.test afd20095e6e845b405df4f2c920cb93301ca69db
 F test/thread003.test b824d4f52b870ae39fc5bae4d8070eca73085dca
@@ -830,7 +830,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 48bf309391c32e7860c293acd13f3dda14212d39 78fc35ff4b01d4a583009ec8b8bf876738ca7b92
-R c5e0f625cc36dd57b9413db473409eda
+P 622378dbe3941f06c717c1e272cd1190e4358428
+R 3349740f721b632b5d673d9f47cec129
 U dan
-Z 137523870678e545b0e8f002ec3d64ab
+Z ddf06d228265c756af2411d823f7066d

diff --git a/manifest.uuid b/manifest.uuid
index 28838b45d1a1d774b4f3aef31e9c641af84eb577..7ca37f20a86b5be52341f053eb314447e19de92c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-622378dbe3941f06c717c1e272cd1190e4358428
\ No newline at end of file
+3b20ad03be55613d922d81aec5313327bf4098b9
\ No newline at end of file

diff --git a/test/permutations.test b/test/permutations.test
index 67be583e09525ededa3944e8cd7c467b5b5aa140..ffd14c6616a90a83200b6cc1a9d2a22fd9c32771 100644 (file)
--- a/test/permutations.test
+++ b/test/permutations.test
@@ -788,7 +788,8 @@ test_suite "wal" -description {
 proc run_tests {name args} {
   array set options $args
 
-  set ::G(perm:name)         $options(-prefix)
+  set ::G(perm:name)         $name
+  set ::G(perm:prefix)       $options(-prefix)
   set ::G(perm:presql)       $options(-presql)
   set ::G(isquick)           1
 
@@ -801,6 +802,7 @@ proc run_tests {name args} {
   uplevel $options(-shutdown)
 
   unset ::G(perm:name)
+  unset ::G(perm:prefix)
   unset ::G(perm:presql)
 }
 

diff --git a/test/tester.tcl b/test/tester.tcl
index 6d0f6ab772ba64534aeb1ae1db841545a53a804f..906f69e7e6dcc7355eb1b78b4cdc67dddbcd9fd9 100644 (file)
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@ -308,8 +308,8 @@ proc do_test {name cmd expected} {
   }
   if {!$go} return
 
-  if {[info exists ::G(perm:name)]} {
-    set name "$::G(perm:name)$name"
+  if {[info exists ::G(perm:prefix)]} {
+    set name "$::G(perm:prefix)$name"
   }
 
   incr_ntest