diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-03-09 11:09:58 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-03-09 11:09:58 (GMT) |
| commit | eed31cac4a9b167daed180e49fd112a9aeed69b4 (patch) | |
| tree | 114bbc8d131f0f12214ccaaadd0ce421fc592d52 /tests | |
| parent | 480580efea39d299051a43808d72f4b554ccfd47 (diff) | |
| parent | f6708dbca5db2d4fd3514b156f8fd2ee059e6cb2 (diff) | |
| download | tk-eed31cac4a9b167daed180e49fd112a9aeed69b4.zip tk-eed31cac4a9b167daed180e49fd112a9aeed69b4.tar.gz tk-eed31cac4a9b167daed180e49fd112a9aeed69b4.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/send.test | 3 | ||||
| -rw-r--r-- | tests/ttk/entry.test | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/send.test b/tests/send.test index 949ce03..9ce8026 100644 --- a/tests/send.test +++ b/tests/send.test @@ -16,6 +16,7 @@ tcltest::loadTestedCommands testConstraint xhost [llength [auto_execok xhost]] testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] || ![string match Linux $::tcl_platform(os)]}] +testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" || [tk windowingsystem] ne "x11" }] # Compute a script that will load Tk into a child interpreter. @@ -297,7 +298,7 @@ test send-8.15 {Tk_SendCmd procedure, local interp, error info} {secureserver te "if 1 {open bogus_file_name}" invoked from within "send t_s_1 {if 1 {open bogus_file_name}}"} {POSIX ENOENT {no such file or directory}}} -test send-8.16 {Tk_SendCmd procedure, bogusCommWindow} {secureserver testsend failsOnUbuntu} { +test send-8.16 {Tk_SendCmd procedure, bogusCommWindow} {secureserver testsend failsOnUbuntu failsOnXQuarz} { testsend prop root InterpRegistry "10234 bogus\n" set result [list [catch {send bogus bogus command} msg] $msg] winfo interps diff --git a/tests/ttk/entry.test b/tests/ttk/entry.test index 8f47483..fc2f9d3 100644 --- a/tests/ttk/entry.test +++ b/tests/ttk/entry.test @@ -8,6 +8,7 @@ namespace import -force tcltest::* loadTestedCommands testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] || ![string match Linux $::tcl_platform(os)]}] +testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" || [tk windowingsystem] ne "x11" }] variable scrollInfo proc scroll args { @@ -77,7 +78,7 @@ test entry-2.1 "Create entry before scrollbar" -body { -expand false -fill x } -cleanup {destroy .te .tsb} -test entry-2.1.1 "Create entry before scrollbar - scrollbar catches up" -constraints failsOnUbuntu -body { +test entry-2.1.1 "Create entry before scrollbar - scrollbar catches up" -constraints {failsOnUbuntu failsOnXQuarz} -body { pack [ttk::entry .te -xscrollcommand [list .tsb set]] \ -expand true -fill both .te insert end [string repeat "abc" 50] |