Update wapptest.tcl so that it deletes extra files if the "Keep files:" checkbox...

FossilOrigin-Name: 09623cc4cc82e3c123d1fd5d88b2f4b50ec5f2cc7e579a7203258bf0c246a74f

diff --git a/manifest b/manifest
index 9b557e68a49b4ba0cce32c2c9275238238c6615f..a50a5799d9fd8d685e74eae3ae9e147354a8ec75 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\s"PRAGMA\svdbe_trace"\soutput,\sshow\sthe\sresults\sof\sOP_Affinity\sopcodes.
-D 2019-05-01T14:41:47.678
+C Update\swapptest.tcl\sso\sthat\sit\sdeletes\sextra\sfiles\sif\sthe\s"Keep\sfiles:"\scheckbox\sis\sclear.\sSet\sit\sby\sdefault.
+D 2019-05-01T15:25:38.538
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1656,7 +1656,7 @@ F test/walslow.test c05c68d4dc2700a982f89133ce103a1a84cc285f
 F test/walthread.test 14b20fcfa6ae152f5d8e12f5dc8a8a724b7ef189f5d8ef1e2ceab79f2af51747
 F test/walvfs.test c0faffda13d045a96dfc541347886bb1a3d6f3205857fc98e683edfab766ea88
 F test/wapp.tcl b440cd8cf57953d3a49e7ee81e6a18f18efdaf113b69f7d8482b0710a64566ec
-F test/wapptest.tcl 7cdac27ab7945b96719aea1afdeac5922b38657d488c676b91fff173552087e0 x
+F test/wapptest.tcl c4c32b89607f970500568cad83ed67a869beaf8c2f07bbc030a335ea6c7c750c x
 F test/where.test 0607caa5a1fbfe7b93b95705981b463a3a0408038f22ae6e9dc11b36902b0e95
 F test/where2.test 478d2170637b9211f593120648858593bf2445a1
 F test/where3.test 2341a294e17193a6b1699ea7f192124a5286ca6acfcc3f4b06d16c931fbcda2c
@@ -1822,7 +1822,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 36dd5b0804797a35d0dc596b6ca4f71813a155c5a470237ab6e3d1bcd9ccc6be
-R ea64878fb21eadae4dca5f57318c8810
-U drh
-Z 04e7e3cb0fe5e91830c8ba41df015203
+P 56604bb60a8ebac8d2854628d1b052d594d7effe14be8333977995dc07b65114
+R 927c208fc5b5ee3c4c01e2595fed96f3
+U dan
+Z 6871de4eaeba6ddd2436f9afc805bd1a

diff --git a/manifest.uuid b/manifest.uuid
index b8c0cbeaad782d3e5164d0c443117755fbe93846..7af2ec64563fc28a50c109f74dadad39a371d875 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-56604bb60a8ebac8d2854628d1b052d594d7effe14be8333977995dc07b65114
\ No newline at end of file
+09623cc4cc82e3c123d1fd5d88b2f4b50ec5f2cc7e579a7203258bf0c246a74f
\ No newline at end of file

diff --git a/test/wapptest.tcl b/test/wapptest.tcl
index be6271a9c0d066d0d22f6773e582d265e453c5cc..fe7ea202e8504f724622446f35e5105c859b09a9 100755 (executable)
--- a/test/wapptest.tcl
+++ b/test/wapptest.tcl
@@ -20,8 +20,8 @@ source [file join [file dirname [info script]] releasetest_data.tcl]
 #
 set G(platform) $::tcl_platform(os)-$::tcl_platform(machine)
 set G(test)     Normal
-set G(keep)     0
-set G(msvc)     0
+set G(keep)     1
+set G(msvc)     [expr {$::tcl_platform(platform)=="windows"}]
 set G(tcl)      [::tcl::pkgconfig get libdir,install]
 set G(jobs)     3
 set G(debug)    0
@@ -197,6 +197,10 @@ proc count_tests_and_errors {name logfile} {
   }
 }
 
+# This command is invoked once a slave process has finished running its
+# tests, successfully or otherwise. Parameter $name is the name of the 
+# test, $rc the exit code returned by the slave process.
+#
 proc slave_test_done {name rc} {
   global G
   set G(test.$name.done) [clock seconds]
@@ -209,8 +213,28 @@ proc slave_test_done {name rc} {
   if {[file exists $G(test.$name.log)]} {
     count_tests_and_errors $name $G(test.$name.log)
   }
+
+  # If the "keep files" checkbox is clear, delete all files except for
+  # the executables and test logs. And any core file that is present.
+  if {$G(keep)==0} {
+    set keeplist {
+      testfixture testfixture.exe
+      sqlite3 sqlite3.exe
+      test.log test-out.txt
+      core
+    }
+    foreach f [glob -nocomplain [file join $G(test.$name.dir) *]] {
+      set t [file tail $f]
+      if {[lsearch $keeplist $t]<0} {
+        catch { file delete -force $f }
+      }
+    }
+  }
 }
 
+# This is a fileevent callback invoked each time a file-descriptor that
+# connects this process to a slave process is readable.
+#
 proc slave_fileevent {name} {
   global G
   set fd $G(test.$name.channel)
@@ -228,6 +252,14 @@ proc slave_fileevent {name} {
   do_some_stuff
 }
 
+# Return the contents of the "slave script" - the script run by slave 
+# processes to actually perform the test. It does two things:
+#
+#   1. Reads and [exec]s the contents of file wapptest_configure.sh.
+#   2. Reads and [exec]s the contents of file wapptest_make.sh.
+#
+# Step 1 is omitted if the test uses MSVC (which does not use configure).
+#
 proc wapptest_slave_script {} {
   global G
   set res {
@@ -270,6 +302,7 @@ proc slave_launch {
   foreach f [glob -nocomplain [file join $dir *]] {
     catch { file delete -force $f }
   }
+  set G(test.$name.dir) $dir
 
   # Write the configure command to wapptest_configure.sh. This file
   # is empty if using MSVC - MSVC does not use configure.