diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-03-09 10:45:12 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-03-09 10:45:12 (GMT) |
| commit | 480580efea39d299051a43808d72f4b554ccfd47 (patch) | |
| tree | 50c1d0c8ce18ddfa5ab03ccee5448a14509c6cd4 | |
| parent | d1ae57ec4a370885ef1f013ce7b6585ce211c6b8 (diff) | |
| parent | 971c05857123c01f58defd978870102e6f3a28aa (diff) | |
| download | tk-480580efea39d299051a43808d72f4b554ccfd47.zip tk-480580efea39d299051a43808d72f4b554ccfd47.tar.gz tk-480580efea39d299051a43808d72f4b554ccfd47.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | .fossil-settings/ignore-glob | 2 | ||||
| -rw-r--r-- | tests/tk.test | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.fossil-settings/ignore-glob b/.fossil-settings/ignore-glob index 22e0537..a1d9b34 100644 --- a/.fossil-settings/ignore-glob +++ b/.fossil-settings/ignore-glob @@ -24,7 +24,7 @@ */versions.vc */version.vc */libtk.vfs -*/libtk_*.zip +*/libtk*.zip html macosx/configure win/Debug* diff --git a/tests/tk.test b/tests/tk.test index 6a9d1e9..de738ef 100644 --- a/tests/tk.test +++ b/tests/tk.test @@ -11,6 +11,7 @@ tcltest::loadTestedCommands namespace import -force tcltest::test testConstraint testprintf [llength [info command testprintf]] +testConstraint failsOnQuarz [expr {![info exists ::env(MAC_CI)]}] test tk-1.1 {tk command: general} -body { tk @@ -154,7 +155,7 @@ test tk-6.3 {tk inactive wrong argument} -body { test tk-6.4 {tk inactive too many arguments} -body { tk inactive reset foo } -returnCodes 1 -result {wrong # args: should be "tk inactive ?-displayof window? ?reset?"} -test tk-6.5 {tk inactive} -body { +test tk-6.5 {tk inactive} -constraints failsOnQuarz -body { tk inactive reset update after 100 |