Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Cached the result of "$tcl_platform(platform) eq "windows"" in test/tester.tcl and replaced all of the repetitions of this expression with a test of the variable. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
2e4143aa4b8800dc7b6453bc61238637 |
| User & Date: | wyoung 2018-09-02 23:05:53.077 |
Context
|
2018-09-03
| ||
| 00:24 | The -quiet flag passed by default to tester.tcl can now be overridden by passing TESTFLAGS to make. Before, there was no way to set -verbose this way because "-quiet -verbose" means the same thing as "-quiet". ... (check-in: 401a4c3d user: wyoung tags: trunk) | |
|
2018-09-02
| ||
| 23:05 | Cached the result of "$tcl_platform(platform) eq "windows"" in test/tester.tcl and replaced all of the repetitions of this expression with a test of the variable. ... (check-in: 2e4143aa user: wyoung tags: trunk) | |
| 21:51 | Removed a debug message accidentally checked in. ... (check-in: 8eadf4c4 user: wyoung tags: trunk) | |
Changes
Changes to test/tester.tcl.
| ︙ | ︙ | |||
27 28 29 30 31 32 33 34 | # have found us a suitable Tcl installation. package require Tcl 8.6 set testfiledir [file normalize [file dirname [info script]]] set testrundir [pwd] set testdir [file normalize [file dirname $argv0]] set fossilexe [file normalize [lindex $argv 0]] | > | | 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 |
# have found us a suitable Tcl installation.
package require Tcl 8.6
set testfiledir [file normalize [file dirname [info script]]]
set testrundir [pwd]
set testdir [file normalize [file dirname $argv0]]
set fossilexe [file normalize [lindex $argv 0]]
set is_windows [expr {$::tcl_platform(platform) eq "windows"}]
if {$is_windows && \
[string length [file extension $fossilexe]] == 0} {
append fossilexe .exe
}
set argv [lrange $argv 1 end]
set i [lsearch $argv -keep]
|
| ︙ | ︙ | |||
441 442 443 444 445 446 447 |
# Finally, attempt to gracefully delete the temporary home directory,
# unless forbidden by external forces.
if {![info exists ::tempKeepHome]} {delete_temporary_home}
}
proc delete_temporary_home {} {
if {$::KEEP} {return}; # All cleanup disabled?
| | | 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 |
# Finally, attempt to gracefully delete the temporary home directory,
# unless forbidden by external forces.
if {![info exists ::tempKeepHome]} {delete_temporary_home}
}
proc delete_temporary_home {} {
if {$::KEEP} {return}; # All cleanup disabled?
if {$::is_windows} {
robust_delete [file join $::tempHomePath _fossil]
} else {
robust_delete [file join $::tempHomePath .fossil]
}
robust_delete $::tempHomePath
}
|
| ︙ | ︙ | |||
626 627 628 629 630 631 632 |
}
}
}
#
# NOTE: On non-Windows systems, fallback to /tmp if it is usable.
#
| | | 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 |
}
}
}
#
# NOTE: On non-Windows systems, fallback to /tmp if it is usable.
#
if {!$::is_windows} {
set value /tmp
if {[file exists $value] && [file isdirectory $value]} {
return $value
}
}
|
| ︙ | ︙ | |||
798 799 800 801 802 803 804 |
# passed to the [test_stop_server] procedure.
proc test_start_server { repository {varName ""} } {
global fossilexe tempPath
set command [list exec $fossilexe server --localhost]
if {[string length $varName] > 0} {
upvar 1 $varName stopArg
}
| | | | | 799 800 801 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 |
# passed to the [test_stop_server] procedure.
proc test_start_server { repository {varName ""} } {
global fossilexe tempPath
set command [list exec $fossilexe server --localhost]
if {[string length $varName] > 0} {
upvar 1 $varName stopArg
}
if {$::is_windows} {
set stopArg [file join [getTemporaryPath] [appendArgs \
[string trim [clock seconds] -] _ [getSeqNo] .stopper]]
lappend command --stopper $stopArg
}
set outFileName [file join $tempPath [appendArgs \
fossil_server_ [string trim [clock seconds] -] _ \
[getSeqNo]]].out
lappend command $repository >&$outFileName &
set pid [eval $command]
if {!$::is_windows} {
set stopArg $pid
}
after 1000; # output might not be there yet
set output [read_file $outFileName]
if {![regexp {Listening.*TCP port (\d+)} $output dummy port]} {
puts stdout "Could not detect Fossil server port, using default..."
set port 8080; # return the default port just in case
}
return [list $pid $port $outFileName]
}
# This procedure stops a Fossil server instance that was previously started
# by the [test_start_server] procedure. The value of the "stop argument"
# will vary by platform as will the exact method used to stop the server.
# The fileName argument is the name of a temporary output file to delete.
proc test_stop_server { stopArg pid fileName } {
if {$::is_windows} {
#
# NOTE: On Windows, the "stop argument" must be the name of a file
# that does NOT already exist.
#
if {[string length $stopArg] > 0 && \
![file exists $stopArg] && \
[catch {write_file $stopArg [clock seconds]}] == 0} {
|
| ︙ | ︙ | |||
952 953 954 955 956 957 958 |
# returns the third to last line of the normalized result.
proc third_to_last_data_line {} {
return [lindex [split [normalize_result] \n] end-2]
}
set tempPath [getTemporaryPath]
| | | 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 |
# returns the third to last line of the normalized result.
proc third_to_last_data_line {} {
return [lindex [split [normalize_result] \n] end-2]
}
set tempPath [getTemporaryPath]
if {$is_windows} {
set tempPath [string map [list \\ /] $tempPath]
}
if {[catch {
set tempFile [file join $tempPath temporary.txt]
write_file $tempFile [clock seconds]; file delete $tempFile
} error] != 0} {
|
| ︙ | ︙ |