diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-03-09 10:42:36 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-03-09 10:42:36 (GMT) |
commit | 971c05857123c01f58defd978870102e6f3a28aa (patch) | |
tree | 0ed56d346050c7fe74c4bd36c278760c2bda6b39 | |
parent | a5e4b9f2e248af1d2b1d0e70a5cee6db6088bcd3 (diff) | |
parent | ede64cf46755c12f156fa876124e4fc3269f99ab (diff) | |
download | tk-971c05857123c01f58defd978870102e6f3a28aa.zip tk-971c05857123c01f58defd978870102e6f3a28aa.tar.gz tk-971c05857123c01f58defd978870102e6f3a28aa.tar.bz2 |
Merge 8.5
-rw-r--r-- | .fossil-settings/ignore-glob | 2 | ||||
-rw-r--r-- | tests/tk.test | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.fossil-settings/ignore-glob b/.fossil-settings/ignore-glob index c0e62c7..8100756 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 doc/man.macros html macosx/configure diff --git a/tests/tk.test b/tests/tk.test index 30a36d9..9e088ce 100644 --- a/tests/tk.test +++ b/tests/tk.test @@ -10,6 +10,8 @@ eval tcltest::configure $argv tcltest::loadTestedCommands namespace import -force tcltest::test +testConstraint failsOnQuarz [expr {![info exists ::env(MAC_CI)]}] + test tk-1.1 {tk command: general} -body { tk } -returnCodes error -result {wrong # args: should be "tk subcommand ?arg ...?"} @@ -152,7 +154,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 |