diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-09 08:24:48 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-09 08:24:48 (GMT) |
| commit | 51680a365f9fe878b8f108688a854c5f22b01d5a (patch) | |
| tree | cd64c2cf433cfc68ea4294726b513125cf895642 /tests | |
| parent | 5bdd278d66f4ea89994c76013f0e52f7662f1cc4 (diff) | |
| parent | d94cc61395e9d006139a4f1bada7200c0d1a08fe (diff) | |
| download | tk-51680a365f9fe878b8f108688a854c5f22b01d5a.zip tk-51680a365f9fe878b8f108688a854c5f22b01d5a.tar.gz tk-51680a365f9fe878b8f108688a854c5f22b01d5a.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/image.test | 6 | ||||
| -rw-r--r-- | tests/select.test | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/tests/image.test b/tests/image.test index 7eaa404..2203b6a 100644 --- a/tests/image.test +++ b/tests/image.test @@ -313,11 +313,9 @@ test image-6.1 {Tk_ImageCmd procedure, "types" option} -constraints { } -body { image types x } -returnCodes error -result {wrong # args: should be "image types"} -test image-6.2 {Tk_ImageCmd procedure, "types" option} -constraints { - testOldImageType -} -body { +test image-6.2 {Tk_ImageCmd procedure, "types" option} -body { lsort [image types] -} -result {bitmap oldtest photo test} +} -match glob -result {bitmap*photo test} test image-7.1 {Tk_ImageCmd procedure, "width" option} -body { diff --git a/tests/select.test b/tests/select.test index ea08af5..26107f8 100644 --- a/tests/select.test +++ b/tests/select.test @@ -1007,7 +1007,7 @@ test select-10.3 {ConvertSelection procedure} -constraints x11 -setup { # testing timers # This one hangs in Exceed test select-10.4 {ConvertSelection procedure} -constraints { - x11 noExceed + x11 noExceed failsOnUbuntu } -setup { setup setupbg |