diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | tests/font.test | 4 | ||||
| -rw-r--r-- | tests/send.test | 2 | ||||
| -rw-r--r-- | tests/textDisp.test | 34 | ||||
| -rw-r--r-- | tests/textTag.test | 6 | ||||
| -rw-r--r-- | tests/textWind.test | 12 | ||||
| -rw-r--r-- | tests/unixFont.test | 2 | ||||
| -rw-r--r-- | tests/winWm.test | 2 |
8 files changed, 33 insertions, 33 deletions
diff --git a/.travis.yml b/.travis.yml index 417c652..ae1178e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -131,9 +131,9 @@ jobs: - BUILD_DIR=unix - CFGOPT="--enable-symbols" # Testing on Mac, various styles - - name: "macOS/Xcode 11.7/Shared/XQuartz" + - name: "macOS/Xcode 12/Shared/XQuartz" os: osx - osx_image: xcode11.7 + osx_image: xcode12 env: - BUILD_DIR=unix - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --disable-corefoundation --x-includes=/opt/X11/include --x-libraries=/opt/X11/lib CFLAGS=-I/usr/local/opt/tcl-tk/include" diff --git a/tests/font.test b/tests/font.test index fbd0a52..37e5739 100644 --- a/tests/font.test +++ b/tests/font.test @@ -1280,7 +1280,7 @@ test font-38.9 {ParseFontNameObj procedure: arguments} { test font-38.10 {ParseFontNameObj procedure: arguments} { list [catch {font actual {times xyz xyz}} msg] $msg } {1 {expected integer but got "xyz"}} -test font-38.12 {ParseFontNameObj procedure: stylelist loop} unixOrPc { +test font-38.12 {ParseFontNameObj procedure: stylelist loop} {unixOrPc failsOnUbuntu} { lrange [font actual {times 12 bold italic overstrike underline}] 4 end } {-weight bold -slant italic -underline 1 -overstrike 1} test font-38.13 {ParseFontNameObj procedure: stylelist error} { @@ -1351,7 +1351,7 @@ tk scaling 0.5 test font-44.1 {TkFontGetPixels: size < 0} failsOnUbuntu { font actual {times -12} -size } 24 -test font-44.2 {TkFontGetPoints: size >= 0} noExceed { +test font-44.2 {TkFontGetPoints: size >= 0} {noExceed failsOnUbuntu} { font actual {times 12} -size } 12 diff --git a/tests/send.test b/tests/send.test index 16d4202..5bd1ade 100644 --- a/tests/send.test +++ b/tests/send.test @@ -295,7 +295,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} { +test send-8.16 {Tk_SendCmd procedure, bogusCommWindow} {secureserver testsend failsOnUbuntu} { testsend prop root InterpRegistry "10234 bogus\n" set result [list [catch {send bogus bogus command} msg] $msg] winfo interps diff --git a/tests/textDisp.test b/tests/textDisp.test index 2be64ce..7b89111 100644 --- a/tests/textDisp.test +++ b/tests/textDisp.test @@ -257,7 +257,7 @@ test textDisp-2.5 {LayoutDLine, word wrap} {textfonts} { .t insert 1.0 "This isx some sample text for testing." list [.t bbox 1.13] [.t bbox 1.14] [.t bbox 1.19] } [list [list 96 5 49 $fixedHeight] [list 5 [expr {$fixedDiff + 18}] 7 $fixedHeight] [list 40 [expr {$fixedDiff + 18}] 7 $fixedHeight]] -test textDisp-2.6 {LayoutDLine, word wrap} { +test textDisp-2.6 {LayoutDLine, word wrap} failsOnUbuntu { .t configure -wrap word .t delete 1.0 end .t insert 1.0 "This isxxx some sample text for testing." @@ -1135,7 +1135,7 @@ test textDisp-8.9 {TkTextChanged} { update list $tk_textRelayout $tk_textRedraw } {{2.0 8.0} {2.0 8.0}} -test textDisp-8.10 {TkTextChanged} { +test textDisp-8.10 {TkTextChanged} failsOnUbuntu { .t configure -wrap char .t delete 1.0 end .t insert 1.0 "Line 1\nLine 2 is long enough to wrap\nLine 3 is also long enough to wrap\nLine 4" @@ -1211,7 +1211,7 @@ test textDisp-9.2 {TkTextRedrawTag} {textfonts} { update list $tk_textRelayout $tk_textRedraw } {{1.0 2.0 2.17} {1.0 2.0 2.17}} -test textDisp-9.3 {TkTextRedrawTag} { +test textDisp-9.3 {TkTextRedrawTag} failsOnUbuntu { .t configure -wrap char .t delete 1.0 end .t insert 1.0 "Line 1\nLine 2 is long enough to wrap around\nLine 3\nLine 4" @@ -1222,7 +1222,7 @@ test textDisp-9.3 {TkTextRedrawTag} { update list $tk_textRelayout $tk_textRedraw } {{2.0 2.20} {2.0 2.20 eof}} -test textDisp-9.4 {TkTextRedrawTag} { +test textDisp-9.4 {TkTextRedrawTag} failsOnUbuntu { .t configure -wrap char .t delete 1.0 end .t insert 1.0 "Line 1\nLine 2 is long enough to wrap around\nLine 3\nLine 4" @@ -1233,7 +1233,7 @@ test textDisp-9.4 {TkTextRedrawTag} { update list $tk_textRelayout $tk_textRedraw } {{2.0 2.20} {2.0 2.20 eof}} -test textDisp-9.5 {TkTextRedrawTag} { +test textDisp-9.5 {TkTextRedrawTag} failsOnUbuntu { .t configure -wrap char .t delete 1.0 end .t insert 1.0 "Line 1\nLine 2 is long enough to wrap around\nLine 3\nLine 4" @@ -1244,7 +1244,7 @@ test textDisp-9.5 {TkTextRedrawTag} { update list $tk_textRelayout $tk_textRedraw } {{2.0 2.20} {2.0 2.20 eof}} -test textDisp-9.6 {TkTextRedrawTag} { +test textDisp-9.6 {TkTextRedrawTag} failsOnUbuntu { .t configure -wrap char .t delete 1.0 end .t insert 1.0 "Line 1\nLine 2 is long enough to wrap\nLine 3 is also long enough to wrap" @@ -1255,7 +1255,7 @@ test textDisp-9.6 {TkTextRedrawTag} { update list $tk_textRelayout $tk_textRedraw } {{2.0 2.20 3.0 3.20} {2.0 2.20 3.0 3.20 eof}} -test textDisp-9.7 {TkTextRedrawTag} { +test textDisp-9.7 {TkTextRedrawTag} failsOnUbuntu { .t configure -wrap char .t delete 1.0 end .t insert 1.0 "Line 1\nLine 2 is long enough to wrap\nLine 3 is also long enough to wrap\nLine 4" @@ -1813,7 +1813,7 @@ test textDisp-14.5 {TkTextXviewCmd procedure} { test textDisp-14.6 {TkTextXviewCmd procedure} { list [catch {.t xview moveto a} msg] $msg } {1 {expected floating-point number but got "a"}} -test textDisp-14.7 {TkTextXviewCmd procedure} { +test textDisp-14.7 {TkTextXviewCmd procedure} failsOnUbuntu { .t delete 1.0 end .t insert end xxxxxxxxx\n .t insert end "xxxxx xxxxxxxxxxx xxxx xxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxx\n" @@ -2010,7 +2010,7 @@ test textDisp-16.9 {TkTextYviewCmd procedure, "moveto" option} { test textDisp-16.10 {TkTextYviewCmd procedure, "moveto" option} { list [catch {.t yview moveto gorp} msg] $msg } {1 {expected floating-point number but got "gorp"}} -test textDisp-16.11 {TkTextYviewCmd procedure, "moveto" option} { +test textDisp-16.11 {TkTextYviewCmd procedure, "moveto" option} failsOnUbuntu { .t yview moveto 0.5 .t index @0,0 } {103.0} @@ -2022,21 +2022,21 @@ test textDisp-16.13 {TkTextYviewCmd procedure, "moveto" option} { .t yview moveto 1.1 .t index @0,0 } {191.0} -test textDisp-16.14 {TkTextYviewCmd procedure, "moveto" option} { +test textDisp-16.14 {TkTextYviewCmd procedure, "moveto" option} failsOnUbuntu { .t yview moveto .75 .t index @0,0 } {151.60} -test textDisp-16.15 {TkTextYviewCmd procedure, "moveto" option} { +test textDisp-16.15 {TkTextYviewCmd procedure, "moveto" option} failsOnUbuntu { .t yview moveto .752 .t index @0,0 } {151.60} -test textDisp-16.16 {TkTextYviewCmd procedure, "moveto" option} {textfonts} { +test textDisp-16.16 {TkTextYviewCmd procedure, "moveto" option} textfonts { set count [expr {5 * $bigHeight + 150 * $fixedHeight}] set extra [expr {0.04 * double($fixedDiff * 150) / double($count)}] .t yview moveto [expr {.753 - $extra}] .t index @0,0 } {151.60} -test textDisp-16.17 {TkTextYviewCmd procedure, "moveto" option} { +test textDisp-16.17 {TkTextYviewCmd procedure, "moveto" option} failsOnUbuntu { .t yview moveto .755 .t index @0,0 } {151.80} @@ -2200,7 +2200,7 @@ test textDisp-16.38 {TkTextYviewCmd procedure} { test textDisp-16.39 {TkTextYviewCmd procedure} { list [catch {.t yview scroll 1.3i pixels} msg] $msg } {0 {}} -test textDisp-16.40 {text count -xpixels} { +test textDisp-16.40 {text count -xpixels} failsOnUbuntu { set res {} lappend res [.t count -xpixels 1.0 1.5] \ [.t count -xpixels 1.5 1.0] \ @@ -3864,7 +3864,7 @@ catch {destroy .t2} .t configure -height 1 update -test textDisp-31.1 {line embedded window height update} { +test textDisp-31.1 {line embedded window height update} failsOnUbuntu { set res {} .t delete 1.0 end .t insert end "abcd\nefgh\nijkl\nmnop\nqrst\nuvwx\nyx" @@ -3877,7 +3877,7 @@ test textDisp-31.1 {line embedded window height update} { set res } [list [expr {100 + $fixedHeight * 6}] [expr {100 + $fixedHeight * 6}] [expr {$fixedHeight * 7}]] -test textDisp-31.2 {line update index shifting} { +test textDisp-31.2 {line update index shifting} failsOnUbuntu { set res {} .t.f configure -height 100 update @@ -3894,7 +3894,7 @@ test textDisp-31.2 {line update index shifting} { set res } [list [expr {100 + $fixedHeight * 6}] [expr {100 + $fixedHeight * 8}] [expr {$fixedHeight * 9}] [expr {$fixedHeight * 7}] [expr {100 + $fixedHeight * 6}]] -test textDisp-31.3 {line update index shifting} { +test textDisp-31.3 {line update index shifting} failsOnUbuntu { # Should do exactly the same as the above, as long # as we are correctly tagging the correct lines for # recalculation. The 'update' and 'delay' must be diff --git a/tests/textTag.test b/tests/textTag.test index aed0491..f7935d8 100644 --- a/tests/textTag.test +++ b/tests/textTag.test @@ -693,7 +693,7 @@ test textTag-16.1 {TkTextPickCurrent procedure} haveCourier12 { event gen .t <ButtonRelease-1> -state 0x100 -x $x3 -y $y3 lappend x [.t index current] } {2.1 3.2 3.2 3.2 3.2 3.2 4.3} -test textTag-16.2 {TkTextPickCurrent procedure} haveCourier12 { +test textTag-16.2 {TkTextPickCurrent procedure} {haveCourier12 failsOnUbuntu} { event generate {} <Motion> -warp 1 -x -1 -y -1; update event gen .t <ButtonRelease-1> -state 0x100 -x $x1 -y $y1 event gen .t <Motion> -x $x2 -y $y2 @@ -758,7 +758,7 @@ test textTag-16.5 {TkTextPickCurrent procedure} haveCourier12 { event gen .t <Motion> -x $x2 -y $y2 .t index current } {3.2} -test textTag-16.6 {TkTextPickCurrent procedure} haveCourier12 { +test textTag-16.6 {TkTextPickCurrent procedure} {haveCourier12 failsOnUbuntu} { event generate {} <Motion> -warp 1 -x -1 -y -1; update foreach i {a b c d} { .t tag remove $i 1.0 end @@ -770,7 +770,7 @@ test textTag-16.6 {TkTextPickCurrent procedure} haveCourier12 { update .t index current } {3.1} -test textTag-16.7 {TkTextPickCurrent procedure} haveCourier12 { +test textTag-16.7 {TkTextPickCurrent procedure} {haveCourier12 failsOnUbuntu} { event generate {} <Motion> -warp 1 -x -1 -y -1; update foreach i {a b c d} { .t tag remove $i 1.0 end diff --git a/tests/textWind.test b/tests/textWind.test index c665006..8d81647 100644 --- a/tests/textWind.test +++ b/tests/textWind.test @@ -552,7 +552,7 @@ test textWind-10.10 {EmbWinLayoutProc procedure, doesn't fit on line} {fonts} { update list [.t bbox .f] [.t bbox 1.13] } {{5 18 127 20} {132 21 7 13}} -test textWind-10.11 {EmbWinLayoutProc procedure, doesn't fit on line} { +test textWind-10.11 {EmbWinLayoutProc procedure, doesn't fit on line} failsOnUbuntu { .t configure -wrap none .t delete 1.0 end .t insert 1.0 "Some sample text" @@ -580,7 +580,7 @@ test textWind-10.13 {EmbWinLayoutProc procedure, doesn't fit on line} {fonts} { list [.t bbox .f] [.t bbox 1.13] } {{5 18 210 65} {}} -test textWind-11.1 {EmbWinDisplayProc procedure, geometry transforms} { +test textWind-11.1 {EmbWinDisplayProc procedure, geometry transforms} failsOnUbuntu { .t delete 1.0 end .t insert 1.0 "Some sample text" pack forget .t @@ -592,7 +592,7 @@ test textWind-11.1 {EmbWinDisplayProc procedure, geometry transforms} { } {30x20+119+55} place forget .t pack .t -test textWind-11.2 {EmbWinDisplayProc procedure, geometry transforms} { +test textWind-11.2 {EmbWinDisplayProc procedure, geometry transforms} failsOnUbuntu { .t delete 1.0 end .t insert 1.0 "Some sample text" pack forget .t @@ -674,7 +674,7 @@ test textWind-12.1 {EmbWinUndisplayProc procedure, mapping/unmapping} { set x } {created mapped modified replaced unmapped mapped off-screen unmapped} -test textWind-13.1 {EmbWinBboxProc procedure} { +test textWind-13.1 {EmbWinBboxProc procedure} failsOnUbuntu { .t delete 1.0 end .t insert 1.0 "Some sample text" frame .f -width 5 -height 5 -bg $color @@ -831,7 +831,7 @@ test textWind-16.1 {EmbWinTextStructureProc procedure} { winfo ismapped .f } 0 pack .t -test textWind-16.2 {EmbWinTextStructureProc procedure} { +test textWind-16.2 {EmbWinTextStructureProc procedure} failsOnUbuntu { .t configure -wrap none .t delete 1.0 end .t insert 1.0 "Some sample text" @@ -856,7 +856,7 @@ test textWind-16.3 {EmbWinTextStructureProc procedure} { update } {} pack .t -test textWind-16.4 {EmbWinTextStructureProc procedure} { +test textWind-16.4 {EmbWinTextStructureProc procedure} failsOnUbuntu { .t configure -wrap none .t delete 1.0 end .t insert 1.0 "Some sample text" diff --git a/tests/unixFont.test b/tests/unixFont.test index 8129279..f4cc3dd 100644 --- a/tests/unixFont.test +++ b/tests/unixFont.test @@ -116,7 +116,7 @@ test unixfont-2.8 {TkpGetFontFromAttributes: loop over returned font names} {uni test unixfont-2.9 {TkpGetFontFromAttributes: reject adobe courier if possible} {unix noExceed failsOnUbuntu} { lindex [font actual {-family courier}] 1 } {courier} -test unixfont-2.10 {TkpGetFontFromAttributes: scalable font found} unix { +test unixfont-2.10 {TkpGetFontFromAttributes: scalable font found} {unix failsOnUbuntu} { lindex [font actual {-family courier -size 37}] 3 } {37} test unixfont-2.11 {TkpGetFontFromAttributes: font cannot be loaded} unix { diff --git a/tests/winWm.test b/tests/winWm.test index 94f18d5..81447a9 100644 --- a/tests/winWm.test +++ b/tests/winWm.test @@ -404,7 +404,7 @@ test winWm-7.4 {UpdateWrapper must maintain focus} -constraints win -setup { test winWm-8.1 {Tk_WmCmd procedure, "iconphoto" option} -constraints win -body { wm iconph . -} -returnCodes error -result {wrong # args: should be "wm iconphoto window ?-default? image1 ?image2 ...?"}} +} -returnCodes error -result {wrong # args: should be "wm iconphoto window ?-default? image1 ?image2 ...?"} test winWm-8.2 {Tk_WmCmd procedure, "iconphoto" option} -constraints win -setup { destroy .t } -body { |