jn
/
punkshell
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update vendormodule tcltest from 2.5.8 to 2.5.9

master
Julian Noble 6 days ago
parent
6ffa781fad
commit
e20f5217be
2 changed files with 174 additions and 174 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 174
      src/vendormodules/tcltest-2.5.9.tm
  2. 174
      src/vfs/_vfscommon.vfs/modules/tcltest-2.5.9.tm

174
src/vendormodules/tcltest-2.5.8.tm → src/vendormodules/tcltest-2.5.9.tm
Unescape View File

@ -21,7 +21,7 @@ namespace eval tcltest {
# When the version number changes, be sure to update the pkgIndex.tcl file, # When the version number changes, be sure to update the pkgIndex.tcl file,
# and the install directory in the Makefiles. When the minor version # and the install directory in the Makefiles. When the minor version
# changes (new feature) be sure to update the man page as well. # changes (new feature) be sure to update the man page as well.
variable Version 2.5.8 variable Version 2.5.9
# Compatibility support for dumb variables defined in tcltest 1 # Compatibility support for dumb variables defined in tcltest 1
# Do not use these. Call [package require] and [info patchlevel] # Do not use these. Call [package require] and [info patchlevel]
@ -43,7 +43,7 @@ namespace eval tcltest {
outputChannel testConstraint outputChannel testConstraint
# Export commands that are duplication (candidates for deprecation) # Export commands that are duplication (candidates for deprecation)
if {!$fullutf} { if {![package vsatisfies [package provide Tcl] 9.0-]} {
namespace export bytestring ;# dups [encoding convertfrom identity] namespace export bytestring ;# dups [encoding convertfrom identity]
} }
namespace export debug ;# [configure -debug] namespace export debug ;# [configure -debug]
@ -515,7 +515,7 @@ namespace eval tcltest {
unset $varName unset $varName
} }
namespace eval [namespace current] \ namespace eval [namespace current] \
[list upvar 0 Option($option) $varName] [list upvar 0 Option($option) $varName]
# Workaround for Bug (now Feature Request) 572889. Grrrr.... # Workaround for Bug (now Feature Request) 572889. Grrrr....
# Track all the variables tied to options # Track all the variables tied to options
lappend OptionControlledVariables $varName lappend OptionControlledVariables $varName
@ -1158,15 +1158,15 @@ proc tcltest::SafeFetch {n1 n2 op} {
proc tcltest::Asciify {s} { proc tcltest::Asciify {s} {
set print "" set print ""
foreach c [split $s ""] { foreach c [split $s ""] {
if {(($c < "\x7F") && [string is print $c]) || ($c eq "\n")} { if {(($c < "\x7F") && [string is print $c]) || ($c eq "\n")} {
append print $c append print $c
} elseif {$c < "\u0100"} { } elseif {$c < "\u0100"} {
append print \\x[format %02X [scan $c %c]] append print \\x[format %02X [scan $c %c]]
} elseif {$c > "\uFFFF"} { } elseif {$c > "\uFFFF"} {
append print \\U[format %08X [scan $c %c]] append print \\U[format %08X [scan $c %c]]
} else { } else {
append print \\u[format %04X [scan $c %c]] append print \\u[format %04X [scan $c %c]]
} }
} }
return $print return $print
} }
@ -1347,33 +1347,33 @@ proc tcltest::DefineConstraintInitializers {} {
ConstraintInitializer unixExecs { ConstraintInitializer unixExecs {
set code 1 set code 1
if {$::tcl_platform(platform) eq "macintosh"} { if {$::tcl_platform(platform) eq "macintosh"} {
set code 0 set code 0
} }
if {$::tcl_platform(platform) eq "windows"} { if {$::tcl_platform(platform) eq "windows"} {
if {[catch { if {[catch {
set file _tcl_test_remove_me.txt set file _tcl_test_remove_me.txt
makeFile {hello} $file makeFile {hello} $file
}]} { }]} {
set code 0 set code 0
} elseif { } elseif {
[catch {exec cat $file}] || [catch {exec cat $file}] ||
[catch {exec echo hello}] || [catch {exec echo hello}] ||
[catch {exec sh -c echo hello}] || [catch {exec sh -c echo hello}] ||
[catch {exec wc $file}] || [catch {exec wc $file}] ||
[catch {exec sleep 1}] || [catch {exec sleep 1}] ||
[catch {exec echo abc > $file}] || [catch {exec echo abc > $file}] ||
[catch {exec chmod 644 $file}] || [catch {exec chmod 644 $file}] ||
[catch {exec rm $file}] || [catch {exec rm $file}] ||
[llength [auto_execok mkdir]] == 0 || [llength [auto_execok mkdir]] == 0 ||
[llength [auto_execok fgrep]] == 0 || [llength [auto_execok fgrep]] == 0 ||
[llength [auto_execok grep]] == 0 || [llength [auto_execok grep]] == 0 ||
[llength [auto_execok ps]] == 0 [llength [auto_execok ps]] == 0
} { } {
set code 0 set code 0
} }
removeFile $file removeFile $file
} }
set code set code
} }
@ -1548,8 +1548,8 @@ proc tcltest::ProcessFlags {flagArray} {
# Call the hook # Call the hook
catch { catch {
array set flag $flagArray array set flag $flagArray
processCmdLineArgsHook [array get flag] processCmdLineArgsHook [array get flag]
} }
return return
} }
@ -1639,7 +1639,7 @@ proc tcltest::Replace::puts {args} {
# return [Puts [lindex $args 0]] # return [Puts [lindex $args 0]]
} }
2 { 2 {
# Either -nonewline or channelId has been specified # Either -nonewline or channel has been specified
if {[lindex $args 0] eq "-nonewline"} { if {[lindex $args 0] eq "-nonewline"} {
append outData [lindex $args end] append outData [lindex $args end]
return return
@ -1651,7 +1651,7 @@ proc tcltest::Replace::puts {args} {
} }
3 { 3 {
if {[lindex $args 0] eq "-nonewline"} { if {[lindex $args 0] eq "-nonewline"} {
# Both -nonewline and channelId are specified, unless # Both -nonewline and channel are specified, unless
# it's an error. -nonewline is supposed to be argv[0]. # it's an error. -nonewline is supposed to be argv[0].
set channel [lindex $args 1] set channel [lindex $args 1]
set newline "" set newline ""
@ -1732,7 +1732,7 @@ proc tcltest::Eval {script {ignoreOutput 1}} {
proc tcltest::CompareStrings {actual expected mode} { proc tcltest::CompareStrings {actual expected mode} {
variable CustomMatch variable CustomMatch
if {![info exists CustomMatch($mode)]} { if {![info exists CustomMatch($mode)]} {
return -code error "No matching command registered for `-match $mode'" return -code error "No matching command registered for `-match $mode'"
} }
set match [namespace eval :: $CustomMatch($mode) [list $expected $actual]] set match [namespace eval :: $CustomMatch($mode) [list $expected $actual]]
if {[catch {expr {$match && $match}} result]} { if {[catch {expr {$match && $match}} result]} {
@ -1810,55 +1810,55 @@ proc tcltest::SubstArguments {argList} {
set token "" set token ""
while {[string length $argList]} { while {[string length $argList]} {
# Look for the next word containing a quote: " { } # Look for the next word containing a quote: " { }
if {[regexp -indices {[^ \t\n]*[\"\{\}]+[^ \t\n]*} \ if {[regexp -indices {[^ \t\n]*[\"\{\}]+[^ \t\n]*} \
$argList all]} { $argList all]} {
# Get the text leading up to this word, but not including # Get the text leading up to this word, but not including
# this word, from the argList. # this word, from the argList.
set text [string range $argList 0 \ set text [string range $argList 0 \
[expr {[lindex $all 0] - 1}]] [expr {[lindex $all 0] - 1}]]
# Get the word with the quote # Get the word with the quote
set word [string range $argList \ set word [string range $argList \
[lindex $all 0] [lindex $all 1]] [lindex $all 0] [lindex $all 1]]
# Remove all text up to and including the word from the # Remove all text up to and including the word from the
# argList. # argList.
set argList [string range $argList \ set argList [string range $argList \
[expr {[lindex $all 1] + 1}] end] [expr {[lindex $all 1] + 1}] end]
} else { } else {
# Take everything up to the end of the argList. # Take everything up to the end of the argList.
set text $argList set text $argList
set word {} set word {}
set argList {} set argList {}
} }
if {$token ne {}} { if {$token ne {}} {
# If we saw a word with quote before, then there is a # If we saw a word with quote before, then there is a
# multi-word token starting with that word. In this case, # multi-word token starting with that word. In this case,
# add the text and the current word to this token. # add the text and the current word to this token.
append token $text $word append token $text $word
} else { } else {
# Add the text to the result. There is no need to parse # Add the text to the result. There is no need to parse
# the text because it couldn't be a part of any multi-word # the text because it couldn't be a part of any multi-word
# token. Then start a new multi-word token with the word # token. Then start a new multi-word token with the word
# because we need to pass this token to the Tcl parser to # because we need to pass this token to the Tcl parser to
# check for balancing quotes # check for balancing quotes
append result $text append result $text
set token $word set token $word
} }
if { [catch {llength $token} length] == 0 && $length == 1} { if { [catch {llength $token} length] == 0 && $length == 1} {
# The token is a valid list so add it to the result. # The token is a valid list so add it to the result.
# lappend result [string trim $token] # lappend result [string trim $token]
append result \{$token\} append result \{$token\}
set token {} set token {}
} }
} }
# If the last token has not been added to the list then there # If the last token has not been added to the list then there
# is a problem. # is a problem.
if { [string length $token] } { if { [string length $token] } {
error "incomplete token \"$token\"" error "incomplete token \"$token\""
} }
return $result return $result
@ -1914,7 +1914,7 @@ proc tcltest::SubstArguments {argList} {
# Arguments: # Arguments:
# name - Name of test, in the form foo-1.2. # name - Name of test, in the form foo-1.2.
# description - Short textual description of the test, to # description - Short textual description of the test, to
# help humans understand what it does. # help humans understand what it does.
# #
# Results: # Results:
# None. # None.
@ -2009,10 +2009,10 @@ proc tcltest::test {name description args} {
foreach {strcode numcode} {ok 0 normal 0 error 1 return 2 break 3 continue 4} { foreach {strcode numcode} {ok 0 normal 0 error 1 return 2 break 3 continue 4} {
set returnCodes [string map -nocase [list $strcode $numcode] $returnCodes] set returnCodes [string map -nocase [list $strcode $numcode] $returnCodes]
} }
# errorCode without returnCode 1 is meaningless # errorCode without returnCode 1 is meaningless
if {$errorCode ne "*" && 1 ni $returnCodes} { if {$errorCode ne "*" && 1 ni $returnCodes} {
set returnCodes 1 set returnCodes 1
} }
} else { } else {
# This is parsing for the old test command format; it is here # This is parsing for the old test command format; it is here
# for backward compatibility. # for backward compatibility.
@ -2095,7 +2095,7 @@ proc tcltest::test {name description args} {
} }
set errorCodeFailure 0 set errorCodeFailure 0
if {$processTest && !$setupFailure && !$codeFailure && $returnCode == 1 && \ if {$processTest && !$setupFailure && !$codeFailure && $returnCode == 1 && \
![string match $errorCode $errorCodeRes(body)]} { ![string match $errorCode $errorCodeRes(body)]} {
set errorCodeFailure 1 set errorCodeFailure 1
} }
@ -2128,7 +2128,7 @@ proc tcltest::test {name description args} {
# check if the answer matched the expected answer # check if the answer matched the expected answer
# Only check if we ran the body of the test (no setup failure) # Only check if we ran the body of the test (no setup failure)
if {!$processTest} { if {!$processTest} {
set scriptFailure 0 set scriptFailure 0
} elseif {$setupFailure || $codeFailure} { } elseif {$setupFailure || $codeFailure} {
set scriptFailure 0 set scriptFailure 0
} elseif {[set scriptCompare [catch { } elseif {[set scriptCompare [catch {
@ -2414,7 +2414,7 @@ proc tcltest::Skipped {name constraints} {
# make sure that the constraints are satisfied. # make sure that the constraints are satisfied.
set doTest 0 set doTest 0
set constraints [string trim $constraints] set constraints [string trim $constraints]
if {[string match {*[$\[]*} $constraints] != 0} { if {[string match {*[$\[]*} $constraints] != 0} {
# full expression, e.g. {$foo > [info tclversion]} # full expression, e.g. {$foo > [info tclversion]}
catch {set doTest [uplevel #0 [list expr $constraints]]} catch {set doTest [uplevel #0 [list expr $constraints]]}
@ -3342,7 +3342,7 @@ proc tcltest::viewFile {name {directory ""}} {
# Side effects: # Side effects:
# None # None
if {!$::tcltest::fullutf} { if {![package vsatisfies [package provide Tcl] 9.0-]} {
proc tcltest::bytestring {string} { proc tcltest::bytestring {string} {
return [encoding convertfrom identity $string] return [encoding convertfrom identity $string]
} }

174
src/vfs/_vfscommon.vfs/modules/tcltest-2.5.8.tm → src/vfs/_vfscommon.vfs/modules/tcltest-2.5.9.tm
Unescape View File

@ -21,7 +21,7 @@ namespace eval tcltest {
# When the version number changes, be sure to update the pkgIndex.tcl file, # When the version number changes, be sure to update the pkgIndex.tcl file,
# and the install directory in the Makefiles. When the minor version # and the install directory in the Makefiles. When the minor version
# changes (new feature) be sure to update the man page as well. # changes (new feature) be sure to update the man page as well.
variable Version 2.5.8 variable Version 2.5.9
# Compatibility support for dumb variables defined in tcltest 1 # Compatibility support for dumb variables defined in tcltest 1
# Do not use these. Call [package require] and [info patchlevel] # Do not use these. Call [package require] and [info patchlevel]
@ -43,7 +43,7 @@ namespace eval tcltest {
outputChannel testConstraint outputChannel testConstraint
# Export commands that are duplication (candidates for deprecation) # Export commands that are duplication (candidates for deprecation)
if {!$fullutf} { if {![package vsatisfies [package provide Tcl] 9.0-]} {
namespace export bytestring ;# dups [encoding convertfrom identity] namespace export bytestring ;# dups [encoding convertfrom identity]
} }
namespace export debug ;# [configure -debug] namespace export debug ;# [configure -debug]
@ -515,7 +515,7 @@ namespace eval tcltest {
unset $varName unset $varName
} }
namespace eval [namespace current] \ namespace eval [namespace current] \
[list upvar 0 Option($option) $varName] [list upvar 0 Option($option) $varName]
# Workaround for Bug (now Feature Request) 572889. Grrrr.... # Workaround for Bug (now Feature Request) 572889. Grrrr....
# Track all the variables tied to options # Track all the variables tied to options
lappend OptionControlledVariables $varName lappend OptionControlledVariables $varName
@ -1158,15 +1158,15 @@ proc tcltest::SafeFetch {n1 n2 op} {
proc tcltest::Asciify {s} { proc tcltest::Asciify {s} {
set print "" set print ""
foreach c [split $s ""] { foreach c [split $s ""] {
if {(($c < "\x7F") && [string is print $c]) || ($c eq "\n")} { if {(($c < "\x7F") && [string is print $c]) || ($c eq "\n")} {
append print $c append print $c
} elseif {$c < "\u0100"} { } elseif {$c < "\u0100"} {
append print \\x[format %02X [scan $c %c]] append print \\x[format %02X [scan $c %c]]
} elseif {$c > "\uFFFF"} { } elseif {$c > "\uFFFF"} {
append print \\U[format %08X [scan $c %c]] append print \\U[format %08X [scan $c %c]]
} else { } else {
append print \\u[format %04X [scan $c %c]] append print \\u[format %04X [scan $c %c]]
} }
} }
return $print return $print
} }
@ -1347,33 +1347,33 @@ proc tcltest::DefineConstraintInitializers {} {
ConstraintInitializer unixExecs { ConstraintInitializer unixExecs {
set code 1 set code 1
if {$::tcl_platform(platform) eq "macintosh"} { if {$::tcl_platform(platform) eq "macintosh"} {
set code 0 set code 0
} }
if {$::tcl_platform(platform) eq "windows"} { if {$::tcl_platform(platform) eq "windows"} {
if {[catch { if {[catch {
set file _tcl_test_remove_me.txt set file _tcl_test_remove_me.txt
makeFile {hello} $file makeFile {hello} $file
}]} { }]} {
set code 0 set code 0
} elseif { } elseif {
[catch {exec cat $file}] || [catch {exec cat $file}] ||
[catch {exec echo hello}] || [catch {exec echo hello}] ||
[catch {exec sh -c echo hello}] || [catch {exec sh -c echo hello}] ||
[catch {exec wc $file}] || [catch {exec wc $file}] ||
[catch {exec sleep 1}] || [catch {exec sleep 1}] ||
[catch {exec echo abc > $file}] || [catch {exec echo abc > $file}] ||
[catch {exec chmod 644 $file}] || [catch {exec chmod 644 $file}] ||
[catch {exec rm $file}] || [catch {exec rm $file}] ||
[llength [auto_execok mkdir]] == 0 || [llength [auto_execok mkdir]] == 0 ||
[llength [auto_execok fgrep]] == 0 || [llength [auto_execok fgrep]] == 0 ||
[llength [auto_execok grep]] == 0 || [llength [auto_execok grep]] == 0 ||
[llength [auto_execok ps]] == 0 [llength [auto_execok ps]] == 0
} { } {
set code 0 set code 0
} }
removeFile $file removeFile $file
} }
set code set code
} }
@ -1548,8 +1548,8 @@ proc tcltest::ProcessFlags {flagArray} {
# Call the hook # Call the hook
catch { catch {
array set flag $flagArray array set flag $flagArray
processCmdLineArgsHook [array get flag] processCmdLineArgsHook [array get flag]
} }
return return
} }
@ -1639,7 +1639,7 @@ proc tcltest::Replace::puts {args} {
# return [Puts [lindex $args 0]] # return [Puts [lindex $args 0]]
} }
2 { 2 {
# Either -nonewline or channelId has been specified # Either -nonewline or channel has been specified
if {[lindex $args 0] eq "-nonewline"} { if {[lindex $args 0] eq "-nonewline"} {
append outData [lindex $args end] append outData [lindex $args end]
return return
@ -1651,7 +1651,7 @@ proc tcltest::Replace::puts {args} {
} }
3 { 3 {
if {[lindex $args 0] eq "-nonewline"} { if {[lindex $args 0] eq "-nonewline"} {
# Both -nonewline and channelId are specified, unless # Both -nonewline and channel are specified, unless
# it's an error. -nonewline is supposed to be argv[0]. # it's an error. -nonewline is supposed to be argv[0].
set channel [lindex $args 1] set channel [lindex $args 1]
set newline "" set newline ""
@ -1732,7 +1732,7 @@ proc tcltest::Eval {script {ignoreOutput 1}} {
proc tcltest::CompareStrings {actual expected mode} { proc tcltest::CompareStrings {actual expected mode} {
variable CustomMatch variable CustomMatch
if {![info exists CustomMatch($mode)]} { if {![info exists CustomMatch($mode)]} {
return -code error "No matching command registered for `-match $mode'" return -code error "No matching command registered for `-match $mode'"
} }
set match [namespace eval :: $CustomMatch($mode) [list $expected $actual]] set match [namespace eval :: $CustomMatch($mode) [list $expected $actual]]
if {[catch {expr {$match && $match}} result]} { if {[catch {expr {$match && $match}} result]} {
@ -1810,55 +1810,55 @@ proc tcltest::SubstArguments {argList} {
set token "" set token ""
while {[string length $argList]} { while {[string length $argList]} {
# Look for the next word containing a quote: " { } # Look for the next word containing a quote: " { }
if {[regexp -indices {[^ \t\n]*[\"\{\}]+[^ \t\n]*} \ if {[regexp -indices {[^ \t\n]*[\"\{\}]+[^ \t\n]*} \
$argList all]} { $argList all]} {
# Get the text leading up to this word, but not including # Get the text leading up to this word, but not including
# this word, from the argList. # this word, from the argList.
set text [string range $argList 0 \ set text [string range $argList 0 \
[expr {[lindex $all 0] - 1}]] [expr {[lindex $all 0] - 1}]]
# Get the word with the quote # Get the word with the quote
set word [string range $argList \ set word [string range $argList \
[lindex $all 0] [lindex $all 1]] [lindex $all 0] [lindex $all 1]]
# Remove all text up to and including the word from the # Remove all text up to and including the word from the
# argList. # argList.
set argList [string range $argList \ set argList [string range $argList \
[expr {[lindex $all 1] + 1}] end] [expr {[lindex $all 1] + 1}] end]
} else { } else {
# Take everything up to the end of the argList. # Take everything up to the end of the argList.
set text $argList set text $argList
set word {} set word {}
set argList {} set argList {}
} }
if {$token ne {}} { if {$token ne {}} {
# If we saw a word with quote before, then there is a # If we saw a word with quote before, then there is a
# multi-word token starting with that word. In this case, # multi-word token starting with that word. In this case,
# add the text and the current word to this token. # add the text and the current word to this token.
append token $text $word append token $text $word
} else { } else {
# Add the text to the result. There is no need to parse # Add the text to the result. There is no need to parse
# the text because it couldn't be a part of any multi-word # the text because it couldn't be a part of any multi-word
# token. Then start a new multi-word token with the word # token. Then start a new multi-word token with the word
# because we need to pass this token to the Tcl parser to # because we need to pass this token to the Tcl parser to
# check for balancing quotes # check for balancing quotes
append result $text append result $text
set token $word set token $word
} }
if { [catch {llength $token} length] == 0 && $length == 1} { if { [catch {llength $token} length] == 0 && $length == 1} {
# The token is a valid list so add it to the result. # The token is a valid list so add it to the result.
# lappend result [string trim $token] # lappend result [string trim $token]
append result \{$token\} append result \{$token\}
set token {} set token {}
} }
} }
# If the last token has not been added to the list then there # If the last token has not been added to the list then there
# is a problem. # is a problem.
if { [string length $token] } { if { [string length $token] } {
error "incomplete token \"$token\"" error "incomplete token \"$token\""
} }
return $result return $result
@ -1914,7 +1914,7 @@ proc tcltest::SubstArguments {argList} {
# Arguments: # Arguments:
# name - Name of test, in the form foo-1.2. # name - Name of test, in the form foo-1.2.
# description - Short textual description of the test, to # description - Short textual description of the test, to
# help humans understand what it does. # help humans understand what it does.
# #
# Results: # Results:
# None. # None.
@ -2009,10 +2009,10 @@ proc tcltest::test {name description args} {
foreach {strcode numcode} {ok 0 normal 0 error 1 return 2 break 3 continue 4} { foreach {strcode numcode} {ok 0 normal 0 error 1 return 2 break 3 continue 4} {
set returnCodes [string map -nocase [list $strcode $numcode] $returnCodes] set returnCodes [string map -nocase [list $strcode $numcode] $returnCodes]
} }
# errorCode without returnCode 1 is meaningless # errorCode without returnCode 1 is meaningless
if {$errorCode ne "*" && 1 ni $returnCodes} { if {$errorCode ne "*" && 1 ni $returnCodes} {
set returnCodes 1 set returnCodes 1
} }
} else { } else {
# This is parsing for the old test command format; it is here # This is parsing for the old test command format; it is here
# for backward compatibility. # for backward compatibility.
@ -2095,7 +2095,7 @@ proc tcltest::test {name description args} {
} }
set errorCodeFailure 0 set errorCodeFailure 0
if {$processTest && !$setupFailure && !$codeFailure && $returnCode == 1 && \ if {$processTest && !$setupFailure && !$codeFailure && $returnCode == 1 && \
![string match $errorCode $errorCodeRes(body)]} { ![string match $errorCode $errorCodeRes(body)]} {
set errorCodeFailure 1 set errorCodeFailure 1
} }
@ -2128,7 +2128,7 @@ proc tcltest::test {name description args} {
# check if the answer matched the expected answer # check if the answer matched the expected answer
# Only check if we ran the body of the test (no setup failure) # Only check if we ran the body of the test (no setup failure)
if {!$processTest} { if {!$processTest} {
set scriptFailure 0 set scriptFailure 0
} elseif {$setupFailure || $codeFailure} { } elseif {$setupFailure || $codeFailure} {
set scriptFailure 0 set scriptFailure 0
} elseif {[set scriptCompare [catch { } elseif {[set scriptCompare [catch {
@ -2414,7 +2414,7 @@ proc tcltest::Skipped {name constraints} {
# make sure that the constraints are satisfied. # make sure that the constraints are satisfied.
set doTest 0 set doTest 0
set constraints [string trim $constraints] set constraints [string trim $constraints]
if {[string match {*[$\[]*} $constraints] != 0} { if {[string match {*[$\[]*} $constraints] != 0} {
# full expression, e.g. {$foo > [info tclversion]} # full expression, e.g. {$foo > [info tclversion]}
catch {set doTest [uplevel #0 [list expr $constraints]]} catch {set doTest [uplevel #0 [list expr $constraints]]}
@ -3342,7 +3342,7 @@ proc tcltest::viewFile {name {directory ""}} {
# Side effects: # Side effects:
# None # None
if {!$::tcltest::fullutf} { if {![package vsatisfies [package provide Tcl] 9.0-]} {
proc tcltest::bytestring {string} { proc tcltest::bytestring {string} {
return [encoding convertfrom identity $string] return [encoding convertfrom identity $string]
} }
Write Preview
Loading…
Cancel
Save