diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-26 09:01:00 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-26 09:01:00 (GMT) |
| commit | bf10d7f187b5017773f1342994469a1bd4e0e8f7 (patch) | |
| tree | 81328c04fa31b5ee38226464900f6dcb2d93ef9a /tests | |
| parent | 587f8fa3d9cfaccb5763689ee36cd8c41efe0689 (diff) | |
| parent | 820f8b93db0118a857d692bea2efa8b3b3149692 (diff) | |
| download | tcl-bf10d7f187b5017773f1342994469a1bd4e0e8f7.zip tcl-bf10d7f187b5017773f1342994469a1bd4e0e8f7.tar.gz tcl-bf10d7f187b5017773f1342994469a1bd4e0e8f7.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/all.tcl | 2 | ||||
| -rw-r--r-- | tests/winTime.test | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/all.tcl b/tests/all.tcl index 89a4f1a..287de1f 100644 --- a/tests/all.tcl +++ b/tests/all.tcl @@ -12,7 +12,7 @@ package prefer latest package require Tcl 8.5- -package require tcltest 2.2 +package require tcltest 2.5 namespace import ::tcltest::* configure {*}$argv -testdir [file dirname [file dirname [file normalize [ diff --git a/tests/winTime.test b/tests/winTime.test index add8f98..dbaa14c 100644 --- a/tests/winTime.test +++ b/tests/winTime.test @@ -19,6 +19,7 @@ if {[lsearch [namespace children] ::tcltest] == -1} { catch [list package require -exact Tcltest [info patchlevel]] testConstraint testwinclock [llength [info commands testwinclock]] +testConstraint knownMsvcBug [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match windows $::env(TRAVIS_OS_NAME)]}] # The next two tests will crash on Windows if the check for negative # clock values is not done properly. @@ -40,7 +41,7 @@ test winTime-1.2 {TclpGetDate} {win} { # with the Windows clock. 30 sec really isn't enough, # but how much time does a tester have patience for? -test winTime-2.1 {Synchronization of Tcl and Windows clocks} {testwinclock} { +test winTime-2.1 {Synchronization of Tcl and Windows clocks} {testwinclock knownMsvcBug} { # May fail due to OS/hardware discrepancies. See: # http://support.microsoft.com/default.aspx?scid=kb;en-us;274323 set failed {} @@ -50,7 +51,7 @@ test winTime-2.1 {Synchronization of Tcl and Windows clocks} {testwinclock} { foreach { sys_sec sys_usec tcl_sec tcl_usec } [testwinclock] break set diff [expr { $tcl_sec - $sys_sec + 1.0e-6 * ( $tcl_usec - $sys_usec ) }] - if { abs($diff) > 0.06 } { + if { abs($diff) > 0.1 } { set failed "Tcl clock differs from system clock by $diff sec" break } else { |