diff options
| -rw-r--r-- | tests/aaa_exit.test | 12 | ||||
| -rw-r--r-- | tests/chanio.test | 10 | ||||
| -rw-r--r-- | tests/clock.test | 21 | ||||
| -rw-r--r-- | tests/cmdMZ.test | 9 | ||||
| -rw-r--r-- | tests/env.test | 3 |
5 files changed, 39 insertions, 16 deletions
diff --git a/tests/aaa_exit.test b/tests/aaa_exit.test index 324c7a8..5957640 100644 --- a/tests/aaa_exit.test +++ b/tests/aaa_exit.test @@ -16,7 +16,11 @@ if {"::tcltest" ni [namespace children]} { namespace import -force ::tcltest::* } -test exit-1.1 {normal, quick exit} { +testConstraint noappverifier [expr { + [llength [info commands testappverifierpresent]] == 0 + || ![testappverifierpresent]}] + +test exit-1.1 {normal, quick exit} -constraints noappverifier -body { set f [open "|[interpreter] << \"exec [interpreter] << {set ::env(TCL_FINALIZE_ON_EXIT) 0;exit}\"" r] set aft [after 1000 {set done "Quick exit hangs !!!"}] fileevent $f readable {after cancel $aft;set done OK} @@ -30,9 +34,9 @@ test exit-1.1 {normal, quick exit} { } } set done -} OK +} -result OK -test exit-1.2 {full-finalized exit} { +test exit-1.2 {full-finalized exit} -constraints noappverifier -body { set f [open "|[interpreter] << \"exec [interpreter] << {set ::env(TCL_FINALIZE_ON_EXIT) 1;exit}\"" r] set aft [after 1000 {set done "Full-finalized exit hangs !!!"}] fileevent $f readable {after cancel $aft;set done OK} @@ -46,7 +50,7 @@ test exit-1.2 {full-finalized exit} { } } set done -} OK +} -result OK # cleanup diff --git a/tests/chanio.test b/tests/chanio.test index 704b887..1095842 100644 --- a/tests/chanio.test +++ b/tests/chanio.test @@ -18,6 +18,10 @@ if {"::tcltest" ni [namespace children]} { namespace import -force ::tcltest::* } +testConstraint noappverifier [expr { + [llength [info commands testappverifierpresent]] == 0 + || ![testappverifierpresent]}] + namespace eval ::tcl::test::io { if {"::tcltest" ni [namespace children]} { @@ -1039,7 +1043,7 @@ test chan-io-6.55 {Tcl_GetsObj: overconverted} -body { test chan-io-6.56 {Tcl_GetsObj: incomplete lines should disable file events} -setup { update variable x {} -} -constraints {stdio fileevent} -body { +} -constraints {stdio fileevent noappverifier} -body { set f [openpipe w+ $path(cat)] chan configure $f -buffering none chan puts -nonewline $f "foobar" @@ -1476,7 +1480,7 @@ test chan-io-13.5 {TranslateInputEOL: crlf mode: naked lf} -body { test chan-io-13.6 {TranslateInputEOL: auto mode: saw cr in last segment} -setup { variable x {} variable y {} -} -constraints {stdio testchannel fileevent} -body { +} -constraints {stdio testchannel fileevent noappverifier} -body { # (chanPtr->flags & INPUT_SAW_CR) # This test may fail on slower machines. set f [openpipe w+ $path(cat)] @@ -2198,7 +2202,7 @@ test chan-io-28.6 {Tcl_CloseEx (half-close) pipe} -setup { exit 0 } cat.tcl] variable done -} -body { +} constraints noappverifier -body { set ff [openpipe r+ $cat] puts $ff Hey close $ff w diff --git a/tests/clock.test b/tests/clock.test index b69808c..e1bbc88 100644 --- a/tests/clock.test +++ b/tests/clock.test @@ -25,6 +25,13 @@ if {[testConstraint win]} { } } +# Application Verifier hooks system calls in a way that locale +# detection fails. Disable tests that depend on that if +# it is running. +testConstraint noappverifier [expr { + [llength [info commands testappverifierpresent]] == 0 + || ![testappverifierpresent]}] + package require msgcat 1.4 testConstraint detroit \ @@ -35943,7 +35950,7 @@ test clock-30.34 {regression test - clock add jump over DST hole with TZ (1 day test clock-31.1 {system locale} \ - -constraints win \ + -constraints {win noappverifier} \ -setup { namespace eval ::tcl::clock { namespace import -force ::testClock::registry @@ -35966,7 +35973,7 @@ test clock-31.1 {system locale} \ -format {%d-%b-%Y}] test clock-31.2 {system locale} \ - -constraints win \ + -constraints {win noappverifier} \ -setup { namespace eval ::tcl::clock { namespace import -force ::testClock::registry @@ -35989,7 +35996,7 @@ test clock-31.2 {system locale} \ -format {the %d' day of %B %Y}] test clock-31.3 {system locale} \ - -constraints win \ + -constraints {win noappverifier} \ -setup { namespace eval ::tcl::clock { namespace import -force ::testClock::registry @@ -36012,7 +36019,7 @@ test clock-31.3 {system locale} \ -format {%l:%M:%S %p}] test clock-31.4 {system locale} \ - -constraints win \ + -constraints {win noappverifier} \ -setup { namespace eval ::tcl::clock { namespace import -force ::testClock::registry @@ -36049,7 +36056,7 @@ test clock-31.4 {system locale} \ -format {%d-%b-%Y}] test clock-31.5 {system locale} \ - -constraints win \ + -constraints {win noappverifier} \ -setup { namespace eval ::tcl::clock { namespace import -force ::testClock::registry @@ -36086,7 +36093,7 @@ test clock-31.5 {system locale} \ -format {the %d' day of %B %Y}] test clock-31.6 {system locale} \ - -constraints win \ + -constraints {win noappverifier} \ -setup { namespace eval ::tcl::clock { namespace import -force ::testClock::registry @@ -37548,7 +37555,7 @@ test clock-49.1 {regression test - localtime with negative arg (Bug 1237907)} \ -result {0 1969|1 {localtime failed \(clock value may be too large/small to represent\)}} test clock-49.2 {regression test - missing time zone file (Bug 1237907)} \ - -constraints win \ + -constraints {win noappverifier} \ -setup { # override the registry so that the test takes place in New York time namespace eval ::tcl::clock { diff --git a/tests/cmdMZ.test b/tests/cmdMZ.test index 7b9032a..69aa755 100644 --- a/tests/cmdMZ.test +++ b/tests/cmdMZ.test @@ -16,6 +16,10 @@ if {"::tcltest" ni [namespace children]} { namespace import -force ::tcltest::* } +testConstraint noappverifier [expr { + [llength [info commands testappverifierpresent]] == 0 + || ![testappverifierpresent]}] + namespace eval ::tcl::test::cmdMZ { namespace import ::tcltest::cleanupTests namespace import ::tcltest::customMatch @@ -407,7 +411,10 @@ test cmdMZ-6.5a {Tcl_TimeRateObjCmd: result format and one iteration} { test cmdMZ-6.5b {Tcl_TimeRateObjCmd: result format without iterations} { regexp {^0 \ws/# 0 # 0 #/sec 0 net-ms$} [timerate {} 0 0] } 1 -test cmdMZ-6.6 {Tcl_TimeRateObjCmd: slower commands take longer, but it remains almost the same time of measurement} -body { +test cmdMZ-6.6 { + Tcl_TimeRateObjCmd: slower commands take longer, but it + remains almost the same time of measurement +} -constraints noappverifier -body { set m1 [timerate {_nrt_sleep 0.01} 50] set m2 [timerate {_nrt_sleep 1.00} 50] if {[testConstraint valgrind] && ([lindex $m1 0] >= 100 || [lindex $m1 2] <= 500)} { diff --git a/tests/env.test b/tests/env.test index 8b3f1df..2534278 100644 --- a/tests/env.test +++ b/tests/env.test @@ -102,12 +102,13 @@ proc cleanup1 {} { envrestore } +# OANOCACHE comes from Application Verifier variable keep { TCL_LIBRARY PATH LD_LIBRARY_PATH LIBPATH PURE_PROG_NAME DISPLAY SHLIB_PATH SYSTEMDRIVE SYSTEMROOT DYLD_LIBRARY_PATH DYLD_FRAMEWORK_PATH DYLD_NEW_LOCAL_SHARED_REGIONS DYLD_NO_FIX_PREBINDING MSYSTEM __CF_USER_TEXT_ENCODING SECURITYSESSIONID LANG WINDIR TERM - CommonProgramFiles CommonProgramFiles(x86) ProgramFiles + CommonProgramFiles CommonProgramFiles(x86) OANOCACHE ProgramFiles ProgramFiles(x86) CommonProgramW6432 ProgramW6432 PROCESSOR_ARCHITECTURE PROCESSOR_ARCHITEW6432 USERPROFILE WINECONFIGDIR WINEDATADIR WINEDLLDIR0 WINEHOMEDIR |