From: dan <dan@noemail.net>
Date: Mon, 4 Apr 2011 15:38:16 +0000 (+0000)
Subject: Add the "--start=[permutation:][testfile]" option to tester.tcl. For starting quick... 
X-Git-Tag: version-3.7.6~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a64d6788452870759825dc74872f388c082599b;p=thirdparty%2Fsqlite.git

Add the "--start=[permutation:][testfile]" option to tester.tcl. For starting quick.test or all.test at the nominated permutation and/or test file.

FossilOrigin-Name: a97e8505f229e05bf97ef9edbe063a52b581f339
---

diff --git a/manifest b/manifest
index 7af2bb9e4b..e93961cb70 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Have\stest_syscall.c\sinclude\s"sqliteInt.h".\sOtherwise\sthe\sSQLITE_OS_UNIX\ssymbol\smay\snot\sbe\sdefined\scorrectly.
-D 2011-04-04T14:03:58.599
+C Add\sthe\s"--start=[permutation:][testfile]"\soption\sto\stester.tcl.\sFor\sstarting\squick.test\sor\sall.test\sat\sthe\snominated\spermutation\sand/or\stest\sfile.
+D 2011-04-04T15:38:16.948
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -685,7 +685,7 @@ F test/tclsqlite.test 8c154101e704170c2be10f137a5499ac2c6da8d3
 F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
 F test/temptable.test f42121a0d29a62f00f93274464164177ab1cc24a
 F test/temptrigger.test b0273db072ce5f37cf19140ceb1f0d524bbe9f05
-F test/tester.tcl dafe0d30279f6d380d5d2a535781dda91b8cfc3f
+F test/tester.tcl 6fa3d2f581b479a3a088b1b5b0d145e548ebe662
 F test/thread001.test a3e6a7254d1cb057836cb3145b60c10bf5b7e60f
 F test/thread002.test afd20095e6e845b405df4f2c920cb93301ca69db
 F test/thread003.test b824d4f52b870ae39fc5bae4d8070eca73085dca
@@ -926,7 +926,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 425e3edb146c497817855dd741878709a25c8b98
-R bfbf218f3efb47247391ca878c887fe4
+P fda8fadd837e399d3fab7a9e6894617a5788d679
+R 4b62570a0a31579c57911e1ba72815ed
 U dan
-Z 9616075d7db18b4b467697e48342db18
+Z 8e0f703ae7b0d0dd238c3eeb189cec4d
diff --git a/manifest.uuid b/manifest.uuid
index 020dda7062..91c9c36fff 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fda8fadd837e399d3fab7a9e6894617a5788d679
\ No newline at end of file
+a97e8505f229e05bf97ef9edbe063a52b581f339
\ No newline at end of file
diff --git a/test/tester.tcl b/test/tester.tcl
index 4c7c10ed73..bae10530c6 100644
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@ -154,6 +154,7 @@ if {[info exists cmdlinearg]==0} {
   #   --backtrace=N
   #   --binarylog=N
   #   --soak=N
+  #   --start=[$permutation:]$testfile
   #
   set cmdlinearg(soft-heap-limit)    0
   set cmdlinearg(maxerror)        1000
@@ -161,6 +162,7 @@ if {[info exists cmdlinearg]==0} {
   set cmdlinearg(backtrace)         10
   set cmdlinearg(binarylog)          0
   set cmdlinearg(soak)               0
+  set cmdlinearg(start)             "" 
 
   set leftover [list]
   foreach a $argv {
@@ -195,6 +197,16 @@ if {[info exists cmdlinearg]==0} {
         foreach {dummy cmdlinearg(soak)} [split $a =] break
         set ::G(issoak) $cmdlinearg(soak)
       }
+      {^-+start=.+$} {
+        foreach {dummy cmdlinearg(start)} [split $a =] break
+
+        set ::G(start:file) $cmdlinearg(start)
+        if {[regexp {(.*):(.*)} $cmdlinearg(start) -> s.perm s.file]} {
+          set ::G(start:permutation) ${s.perm}
+          set ::G(start:file)        ${s.file}
+        }
+        if {$::G(start:file) == ""} {unset ::G(start:file)}
+      }
       default {
         lappend leftover $a
       }
@@ -1325,6 +1337,15 @@ proc slave_test_script {script} {
 proc slave_test_file {zFile} {
   set tail [file tail $zFile]
 
+  if {[info exists ::G(start:permutation)]} {
+    if {[permutation] != $::G(start:permutation)} return
+    unset ::G(start:permutation)
+  }
+  if {[info exists ::G(start:file)]} {
+    if {$tail != $::G(start:file) && $tail!="$::G(start:file).test"} return
+    unset ::G(start:file)
+  }
+
   # Remember the value of the shared-cache setting. So that it is possible
   # to check afterwards that it was not modified by the test script.
   #