diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-02 12:48:29 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-02 12:48:29 (GMT) |
| commit | 4def430d27e774e715a2b4592b3f4b6ab895fb92 (patch) | |
| tree | 73d5c5874f665c25efcc810695d0b973c3d22ce0 | |
| parent | 9367d3491bbeeca349b9e0a0f08f48d304cf43ab (diff) | |
| parent | 09e5d9ded7cbb1cbd9098052f41da54a917a310a (diff) | |
| download | tcl-4def430d27e774e715a2b4592b3f4b6ab895fb92.zip tcl-4def430d27e774e715a2b4592b3f4b6ab895fb92.tar.gz tcl-4def430d27e774e715a2b4592b3f4b6ab895fb92.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | tests/cmdMZ.test | 5 | ||||
| -rw-r--r-- | win/tclWinTime.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tests/cmdMZ.test b/tests/cmdMZ.test index e4db915..a6f7361 100644 --- a/tests/cmdMZ.test +++ b/tests/cmdMZ.test @@ -22,8 +22,11 @@ namespace eval ::tcl::test::cmdMZ { namespace import ::tcltest::makeFile namespace import ::tcltest::removeFile namespace import ::tcltest::temporaryDirectory + namespace import ::tcltest::testConstraint namespace import ::tcltest::test + testConstraint knownMsvcBug [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match windows $::env(TRAVIS_OS_NAME)]}] + proc ListGlobMatch {expected actual} { if {[llength $expected] != [llength $actual]} { return 0 @@ -339,7 +342,7 @@ test cmdMZ-5.4 {Tcl_TimeObjCmd: nothing happens with negative iteration counts} test cmdMZ-5.5 {Tcl_TimeObjCmd: result format} -body { time {format 1} } -match regexp -result {^\d+ microseconds per iteration} -test cmdMZ-5.6 {Tcl_TimeObjCmd: slower commands take longer} { +test cmdMZ-5.6 {Tcl_TimeObjCmd: slower commands take longer} knownMsvcBug { expr {[lindex [time {_nrt_sleep 1}] 0] < [lindex [time {_nrt_sleep 20}] 0]} } 1 test cmdMZ-5.7 {Tcl_TimeObjCmd: errors generate right trace} { diff --git a/win/tclWinTime.c b/win/tclWinTime.c index 716b27e..07498b0 100644 --- a/win/tclWinTime.c +++ b/win/tclWinTime.c @@ -99,7 +99,7 @@ static struct { int initialized; /* 1 if initialized, 0 otherwise */ int perfCounter; /* 1 if performance counter usable for wide clicks */ double microsecsScale; /* Denominator scale between clock / microsecs */ -} wideClick = {0, 0.0}; +} wideClick = {0, 0, 0.0}; /* |