Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Improve handling of setting up the initial temporary directory. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | testerCleanup |
| Files: | files | file ages | folders |
| SHA1: |
e6e79ac6fbc1404991c84952a6bb9c3b |
| User & Date: | mistachkin 2016-03-03 21:50:56.009 |
Context
|
2016-03-03
| ||
| 22:12 | Treat 'file normalize' with a bit more skepticism. ... (check-in: e264125a user: mistachkin tags: testerCleanup) | |
| 21:50 | Improve handling of setting up the initial temporary directory. ... (check-in: e6e79ac6 user: mistachkin tags: testerCleanup) | |
| 18:49 | Centralize early-return handling from the tests, always calling the test cleanup (which is harmless if not needed). ... (check-in: b01a51f4 user: mistachkin tags: testerCleanup) | |
Changes
Changes to test/tester.tcl.
| ︙ | ︙ | |||
384 385 386 387 388 389 390 391 392 393 394 395 396 397 |
}
# Append all arguments into a single value and then returns it.
#
proc appendArgs {args} {
eval append result $args
}
# Return the name of the versioned settings file containing the TH1
# setup script.
#
proc getTh1SetupFileName {} {
#
# NOTE: This uses the "testdir" global variable provided by the
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 384 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 |
}
# Append all arguments into a single value and then returns it.
#
proc appendArgs {args} {
eval append result $args
}
# Returns the value of the specified environment variable -OR- any empty
# string if it does not exist.
#
proc getEnvironmentVariable { name } {
return [expr {[info exists ::env($name)] ? $::env($name) : ""}]
}
# Returns a usable temporary directory -OR- fails the testing process.
#
proc getTemporaryPath {} {
#
# NOTE: Build the list of "temporary directory" environment variables
# to check, including all reasonable "cases" of the environment
# variable names.
#
set names [list]
#
# TODO: Add more here, if necessary.
#
foreach name [list FOSSIL_TEST_TEMP FOSSIL_TEMP TEMP TMP] {
lappend names [string toupper $name] [string tolower $name] \
[string totitle $name]
}
#
# NOTE: Check if we can use any of the environment variables.
#
foreach name $names {
set value [getEnvironmentVariable $name]
if {[string length $value] > 0} then {
if {[file exists $value] && [file isdirectory $value]} then {
return [file normalize $value]
}
}
}
#
# NOTE: On non-Windows systems, fallback to /tmp if it is usable.
#
if {$::tcl_platform(platform) ne "windows"} {
set value /tmp
if {[file exists $value] && [file isdirectory $value]} then {
return $value
}
}
#
# NOTE: There must be a usable temporary directory to continue testing.
#
error "Cannot find a usable temporary directory, testing halted."
}
# Return the name of the versioned settings file containing the TH1
# setup script.
#
proc getTh1SetupFileName {} {
#
# NOTE: This uses the "testdir" global variable provided by the
|
| ︙ | ︙ | |||
598 599 600 601 602 603 604 |
}
# returns the third to last line of the normalized result.
proc third_to_last_data_line {} {
return [lindex [split [normalize_result] \n] end-2]
}
| | < < < | 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 |
}
# 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 {$tcl_platform(platform) eq "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} {
error "Could not write file \"$tempFile\" in directory \"$tempPath\",\
please set TEMP variable in environment, error: $error"
}
|
| ︙ | ︙ |