Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add the "--jobs N" option to the releasetest.tcl script to allow tests to be run in parallel by N processes. N defaults to 1. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | mp-releasetest |
Files: | files | file ages | folders |
SHA1: |
3d29f912cb7c6ee3e4903b1b14dd7ae8 |
User & Date: | dan 2015-11-02 18:32:00.281 |
Context
2015-11-02
| ||
20:24 | Fix releasetest.tcl so that output lines are less than 80 characters wide. (check-in: aef177fef0 user: dan tags: mp-releasetest) | |
18:32 | Add the "--jobs N" option to the releasetest.tcl script to allow tests to be run in parallel by N processes. N defaults to 1. (check-in: 3d29f912cb user: dan tags: mp-releasetest) | |
2015-11-01
| ||
21:19 | If a table-constraint PRIMARY KEY lists a single column in single-quotes and that column has type INTEGER, then make that column an integer primary key, for historical compatibility. Fix for ticket [ac661962a2aeab3c331]. (check-in: db319a035f user: drh tags: trunk) | |
Changes
Changes to test/releasetest.tcl.
︙ | ︙ | |||
281 282 283 284 285 286 287 288 289 290 291 292 293 294 | }] # End of configuration section. ######################################################################### ######################################################################### foreach {key value} [array get ::Platforms] { foreach {v t} $value { if {0==[info exists ::Configs($v)]} { puts stderr "No such configuration: \"$v\"" exit -1 } } | > > > | 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 | }] # End of configuration section. ######################################################################### ######################################################################### # Configuration verification: Check that each entry in the list of configs # specified for each platforms exists. # foreach {key value} [array get ::Platforms] { foreach {v t} $value { if {0==[info exists ::Configs($v)]} { puts stderr "No such configuration: \"$v\"" exit -1 } } |
︙ | ︙ | |||
382 383 384 385 386 387 388 | set errmsg "Test did not complete" if {[file readable core]} { append errmsg " - core file exists" } } } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > | 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 | set errmsg "Test did not complete" if {[file readable core]} { append errmsg " - core file exists" } } } #-------------------------------------------------------------------------- # This command is invoked as the [main] routine for scripts run with the # "--slave" option. # # For each test (i.e. "configure && make test" execution), the master # process spawns a process with the --slave option. It writes two lines # to the slaves stdin. The first contains a single boolean value - the # value of ::TRACE to use in the slave script. The second line contains a # list in the same format as each element of the list passed to the # [run_all_test_suites] command in the master process. # # The slave then runs the "configure && make test" commands specified. It # exits successfully if the tests passes, or with a non-zero error code # otherwise. # proc run_slave_test {} { # Read global vars configuration from stdin. set V [gets stdin] foreach {::TRACE} $V {} # Read the test-suite configuration from stdin. set T [gets stdin] foreach {title dir configOpts testtarget cflags opts} $T {} # Create and switch to the test directory. trace_cmd file mkdir $dir trace_cmd cd $dir catch {file delete core} catch {file delete test.log} # Run the "./configure && make" commands. set rc 0 set rc [catch [configureCommand $configOpts]] if {!$rc} { set rc [catch [makeCommand $testtarget $cflags $opts]] } # Exis successfully if the test passed, or with a non-zero error code # otherwise. exit $rc } # This command is invoked in the master process each time a slave # file-descriptor is readable. # proc slave_fileevent {fd T tm1} { global G foreach {title dir configOpts testtarget cflags opts} $T {} if {[eof $fd]} { fconfigure $fd -blocking 1 set rc [catch { close $fd }] set errmsg {} count_tests_and_errors [file join $dir test.log] rc errmsg if {!$::TRACE} { set tm2 [clock seconds] set hours [expr {($tm2-$tm1)/3600}] set minutes [expr {(($tm2-$tm1)/60)%60}] set seconds [expr {($tm2-$tm1)%60}] set tm [format (%02d:%02d:%02d) $hours $minutes $seconds] if {$rc} { set status FAIL incr ::NERR } else { set status Ok } set n [string length $title] PUTS "finished: ${title}[string repeat . [expr {63-$n}]] $status $tm" if {$errmsg!=""} {PUTS " $errmsg"} flush stdout } incr G(nJob) -1 } else { set line [gets $fd] if {[string trim $line] != ""} { puts "Trace : $title - \"$line\"" } } } #-------------------------------------------------------------------------- # The only argument passed to this function is a list of test-suites to # run. Each "test-suite" is itself a list consisting of the following # elements: # # * Test title (for display). # * The name of the directory to run the test in. # * The argument for [configureCommand] # * The first argument for [makeCommand] # * The second argument for [makeCommand] # * The third argument for [makeCommand] # proc run_all_test_suites {alltests} { global G set tests $alltests set G(nJob) 0 while {[llength $tests]>0 || $G(nJob)>0} { if {$G(nJob)>=$::JOBS || [llength $tests]==0} { vwait G(nJob) } if {[llength $tests]>0} { set T [lindex $tests 0] set tests [lrange $tests 1 end] foreach {title dir configOpts testtarget cflags opts} $T {} if {!$::TRACE} { set n [string length $title] PUTS "starting: ${title}" flush stdout } # Run the job. # set tm1 [clock seconds] incr G(nJob) set fd [open "|[info nameofexecutable] [info script] --slave" r+] fconfigure $fd -blocking 0 fileevent $fd readable [list slave_fileevent $fd $T $tm1] puts $fd [list $::TRACE] puts $fd [list {*}$T] flush $fd } } } proc add_test_suite {listvar name testtarget config} { upvar $listvar alltests # Tcl variable $opts is used to build up the value used to set the # OPTS Makefile variable. Variable $cflags holds the value for # CFLAGS. The makefile will pass OPTS to both gcc and lemon, but # CFLAGS is only passed to gcc. # set cflags [expr {$::MSVC ? "-Zi" : "-g"}] set opts "" |
︙ | ︙ | |||
427 428 429 430 431 432 433 | if {$::tcl_platform(platform)=="windows"} { append opts " -DSQLITE_OS_WIN=1" } else { append opts " -DSQLITE_OS_UNIX=1" } | < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 | if {$::tcl_platform(platform)=="windows"} { append opts " -DSQLITE_OS_WIN=1" } else { append opts " -DSQLITE_OS_UNIX=1" } lappend alltests [list $title $dir $configOpts $testtarget $cflags $opts] } # The following procedure returns the "configure" command to be exectued for # the current platform, which may be Windows (via MinGW, etc). # proc configureCommand {opts} { if {$::MSVC} return [list]; # This is not needed for MSVC. |
︙ | ︙ | |||
503 504 505 506 507 508 509 510 | # And it executes the command of its arguments in the calling context # if ::DRYRUN is false. # proc trace_cmd {args} { if {$::TRACE} { PUTS $args } if {!$::DRYRUN} { | > | > > > > > > > > > > > > | 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 | # And it executes the command of its arguments in the calling context # if ::DRYRUN is false. # proc trace_cmd {args} { if {$::TRACE} { PUTS $args } set res "" if {!$::DRYRUN} { set res [uplevel 1 $args] } return $res } # This proc processes the command line options passed to this script. # Currently the only option supported is "-makefile", default # "releasetest.mk". Set the ::MAKEFILE variable to the value of this # option. # proc process_options {argv} { set ::SRCDIR [file normalize [file dirname [file dirname $::argv0]]] set ::QUICK 0 set ::MSVC 0 set ::BUILDONLY 0 set ::DRYRUN 0 set ::EXEC exec set ::TRACE 0 set ::JOBS 1 set ::WITHTCL {} set config {} set platform $::tcl_platform(os)-$::tcl_platform(machine) for {set i 0} {$i < [llength $argv]} {incr i} { set x [lindex $argv $i] if {[regexp {^--[a-z]} $x]} {set x [string range $x 1 end]} switch -glob -- $x { -slave { run_slave_test exit } -srcdir { incr i set ::SRCDIR [file normalize [lindex $argv $i]] } -platform { incr i set platform [lindex $argv $i] } -jobs { incr i set ::JOBS [lindex $argv $i] } -quick { set ::QUICK 1 } -veryquick { set ::QUICK 2 } |
︙ | ︙ | |||
685 686 687 688 689 690 691 | set target testfixture if {$::MSVC} {append target .exe} } } set config_options [concat $::Configs($zConfig) $::EXTRACONFIG] incr NTEST | | | | > > | 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 | set target testfixture if {$::MSVC} {append target .exe} } } set config_options [concat $::Configs($zConfig) $::EXTRACONFIG] incr NTEST add_test_suite all $zConfig $target $config_options # If the configuration included the SQLITE_DEBUG option, then remove # it and run veryquick.test. If it did not include the SQLITE_DEBUG option # add it and run veryquick.test. if {$target!="checksymbols" && $target!="valgrindtest" && $target!="fuzzoomtest" && !$::BUILDONLY && $::QUICK<2} { set debug_idx [lsearch -glob $config_options -DSQLITE_DEBUG*] set xtarget $target regsub -all {fulltest[a-z]*} $xtarget test xtarget regsub -all {fuzzoomtest} $xtarget fuzztest xtarget if {$debug_idx < 0} { incr NTEST append config_options " -DSQLITE_DEBUG=1" add_test_suite all "${zConfig}_debug" $xtarget $config_options } else { incr NTEST regsub { *-DSQLITE_MEMDEBUG[^ ]* *} $config_options { } config_options regsub { *-DSQLITE_DEBUG[^ ]* *} $config_options { } config_options add_test_suite all "${zConfig}_ndebug" $xtarget $config_options } } } run_all_test_suites $all set elapsetime [expr {[clock seconds]-$STARTTIME}] set hr [expr {$elapsetime/3600}] set min [expr {($elapsetime/60)%60}] set sec [expr {$elapsetime%60}] set etime [format (%02d:%02d:%02d) $hr $min $sec] PUTS [string repeat * 79] |
︙ | ︙ |