Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add options to wapptest.tcl similar to those supported by releasetest.tcl. Also add the -noui switch, for running without wapp altogether. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
005a169406ccea6e3cc42271620870d9 |
User & Date: | dan 2019-05-02 17:06:01.169 |
Context
2019-05-02
| ||
17:45 | Ensure that the typeof() function always returns SQLITE_FLOAT for floating point values even when the value is stored as an integer to save space. (check-in: 48889530a9 user: drh tags: trunk) | |
17:06 | Add options to wapptest.tcl similar to those supported by releasetest.tcl. Also add the -noui switch, for running without wapp altogether. (check-in: 005a169406 user: dan tags: trunk) | |
15:56 | Earlier detection of a database corruption case in balance_nonroot(), to prevent a possible use of an uninitialized variable. (check-in: c509d8a8ae user: drh tags: trunk) | |
Changes
Changes to test/wapptest.tcl.
︙ | |||
17 18 19 20 21 22 23 | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | - + + + + + - + + + + + + + + + + + + + + + + + | # G(msvc) - Boolean. True to use MSVC as the compiler. # G(tcl) - Use Tcl from this directory for builds. # G(jobs) - How many sub-processes to run simultaneously. # set G(platform) $::tcl_platform(os)-$::tcl_platform(machine) set G(test) Normal set G(keep) 1 |
︙ | |||
192 193 194 195 196 197 198 199 200 201 202 203 204 205 | 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 | + + + + + + + + + + + + + + + + + + + + + + + + + | } elseif {!$seen} { set G(test.$name.errmsg) "Test did not complete" if {[file readable core]} { append G(test.$name.errmsg) " - core file exists" } } } proc wapptest_output {str} { global G if {$G(stdout)} { puts $str } if {[info exists G(log)]} { puts $G(log) $str flush $G(log) } } proc wapptest_openlog {} { global G set G(log) [open wapptest-out.txt w+] } proc wapptest_closelog {} { global G close $G(log) unset G(log) } proc format_seconds {seconds} { set min [format %.2d [expr ($seconds / 60) % 60]] set hr [format %.2d [expr $seconds / 3600]] set sec [format %.2d [expr $seconds % 60]] return "$hr:$min:$sec" } # 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 |
︙ | |||
229 230 231 232 233 234 235 236 237 238 239 240 241 242 | 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 | + + + + + + + + + + + + | 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 } } } } # Format a message regarding the success or failure of hte test. set t [format_seconds [expr $G(test.$name.done) - $G(test.$name.start)]] set res "OK" if {$G(test.$name.nError)} { set res "FAILED" } set dots [string repeat . [expr 60 - [string length $name]]] set msg "$name $dots $res ($t)" wapptest_output $msg if {[info exists G(test.$name.errmsg)] && $G(test.$name.errmsg)!=""} { wapptest_output " $G(test.$config.errmsg)" } } # 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 |
︙ | |||
368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 | 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 | + + + + + | foreach j $G(test_array) { set name [dict get $j config] incr nError $G(test.$name.nError) incr nTest $G(test.$name.nTest) incr nConfig } set G(result) "$nError errors from $nTest tests in $nConfig configurations." wapptest_output [string repeat * 70] wapptest_output $G(result) catch { append G(result) " SQLite version $G(sqlite_version)" wapptest_output " SQLite version $G(sqlite_version)" } set G(state) "stopped" wapptest_closelog if {$G(noui)} { exit 0 } } else { set nLaunch [expr $G(jobs) - $nRunning] foreach j $G(test_array) { if {$nLaunch<=0} break set name [dict get $j config] if { ![info exists G(test.$name.channel)] && ![info exists G(test.$name.done)] |
︙ | |||
539 540 541 542 543 544 545 | 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 | - - - - - + | if {$G(test.$config.nError)>0} { set class "testfail" } else { set class "testdone" } set seconds [expr $G(test.$config.done) - $G(test.$config.start)] } |
︙ | |||
602 603 604 605 606 607 608 | 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 | - + - + | if {[wapp-param-exists control_$v]} { set G($v) [wapp-param control_$v] } } if {[wapp-param-exists control_run]} { # This is a "run test" command. |
︙ | |||
768 769 770 771 772 773 774 775 776 | 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + | close $fd wapp-trim { <pre> %html($data) </pre> } } # Print out a usage message. Then do [exit 1]. # proc wapptest_usage {} { puts stderr { This Tcl script is used to test various configurations of SQLite. By default it uses "wapp" to provide an interactive interface. Supported command line options (all optional) are: --platform PLATFORM (which tests to run) --smoketest (run "make smoketest" only) --veryquick (run veryquick.test only) --buildonly (build executables, do not run tests) --jobs N (number of concurrent jobs) --tcl DIR (where to find tclConfig.sh) --deletefiles (delete extra files after each test) --msvc (Use MS Visual C) --debug (Also run [n]debugging versions of tests) --noui (do not use wapp) } exit 1 } # Sort command line arguments into two groups: those that belong to wapp, # and those that belong to the application. set WAPPARG(-server) 1 set WAPPARG(-local) 1 set WAPPARG(-scgi) 1 set WAPPARG(-remote-scgi) 1 set WAPPARG(-fromip) 1 set WAPPARG(-nowait) 0 set WAPPARG(-cgi) 0 set lWappArg [list] set lTestArg [list] for {set i 0} {$i < [llength $argv]} {incr i} { set arg [lindex $argv $i] if {[string range $arg 0 1]=="--"} { set arg [string range $arg 1 end] } if {[info exists WAPPARG($arg)]} { lappend lWappArg $arg if {$WAPPARG($arg)} { incr i lappend lWappArg [lindex $argv $i] } } else { lappend lTestArg $arg } } for {set i 0} {$i < [llength $lTestArg]} {incr i} { switch -- [lindex $lTestArg $i] { -platform { if {$i==[llength $lTestArg]-1} { wapptest_usage } incr i set arg [lindex $lTestArg $i] set lPlatform [array names ::Platforms] if {[lsearch $lPlatform $arg]<0} { puts stderr "No such platform: $arg. Platforms are: $lPlatform" exit -1 } set G(platform) $arg } -smoketest { set G(test) Smoketest } -veryquick { set G(test) Veryquick } -buildonly { set G(test) Build-Only } -jobs { if {$i==[llength $lTestArg]-1} { wapptest_usage } incr i set G(jobs) [lindex $lTestArg $i] } -tcl { if {$i==[llength $lTestArg]-1} { wapptest_usage } incr i set G(tcl) [lindex $lTestArg $i] } -deletefiles { set G(keep) 0 } -msvc { set G(msvc) 1 } -debug { set G(debug) 1 } -noui { set G(noui) 1 set G(stdout) 1 } -stdout { set G(stdout) 1 } default { puts stderr "Unrecognized option: [lindex $lTestArg $i]" wapptest_usage } } } wapptest_init if {$G(noui)==0} { |