summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/mac-build.yml8
-rw-r--r--tests/bitmap.test4
-rw-r--r--tests/border.test3
-rw-r--r--tests/canvText.test3
-rw-r--r--tests/color.test4
-rw-r--r--tests/cursor.test3
-rw-r--r--tests/font.test5
-rw-r--r--tests/text.test10
-rw-r--r--tests/textWind.test3
-rw-r--r--tests/ttk/ttk.test4
-rw-r--r--tests/winWm.test1
11 files changed, 27 insertions, 21 deletions
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml
index 32b5a11..acc063a 100644
--- a/.github/workflows/mac-build.yml
+++ b/.github/workflows/mac-build.yml
@@ -68,15 +68,11 @@ jobs:
: do nothing
}
fi
- ( runXvfb :0; make test-classic; exit $? ) | tee out-classic.txt || {
+ ( runXvfb :0; make test-classic test-ttk; exit $? ) | tee out.txt || {
echo "::error::Failure during Test"
exit 1
}
- ( runXvfb :0; make test-ttk; exit $? ) | tee out-ttk.txt || {
- echo "::error::Failure during Test"
- exit 1
- }
- cat out-classic.txt out-ttk.txt | grep -q "Failed [1-9]" && {
+ cat out.txt | grep -q "Failed [1-9]" && {
echo "::error::Failure during Test"
exit 1
}
diff --git a/tests/bitmap.test b/tests/bitmap.test
index 2b74c13..06280d2 100644
--- a/tests/bitmap.test
+++ b/tests/bitmap.test
@@ -10,7 +10,7 @@ package require tcltest 2.2
eval tcltest::configure $argv
tcltest::loadTestedCommands
-testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] || ![string match Linux $::tcl_platform(os)]}]
+testConstraint failsOnQuarz [expr {![info exists ::env(MAC_CI)]}]
test bitmap-1.1 {Tk_AllocBitmapFromObj - converting internal reps} testbitmap {
set x gray25
@@ -66,7 +66,7 @@ test bitmap-3.1 {Tk_FreeBitmapFromObj - reference counts} testbitmap {
lappend result [testbitmap questhead]
} {{{3 1}} {{2 1}} {{1 1}} {}}
-test bitmap-4.1 {FreeBitmapObjProc} {testbitmap failsOnUbuntu} {
+test bitmap-4.1 {FreeBitmapObjProc} {testbitmap failsOnUbuntu failsOnQuarz} {
destroy .b
set x [format questhead]
button .b -bitmap $x
diff --git a/tests/border.test b/tests/border.test
index 33bdfd0..43e6aae 100644
--- a/tests/border.test
+++ b/tests/border.test
@@ -15,6 +15,7 @@ if {[testConstraint pseudocolor8]} {
}
testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] || ![string match Linux $::tcl_platform(os)]}]
+testConstraint failsOnQuarz [expr {![info exists ::env(MAC_CI)]}]
test border-1.1 {Tk_AllocBorderFromObj - converting internal reps} testborder {
set x orange
@@ -104,7 +105,7 @@ test border-3.4 {Tk_Free3DBorder - unlinking from list} {pseudocolor8 testborder
lappend result [testborder purple]
} {{{4 1} {3 0} {2 0} {1 0}} {{4 1} {2 0} {1 0}} {{4 1} {2 0}} {{2 0}} {}}
-test border-4.1 {FreeBorderObjProc} {testborder failsOnUbuntu} {
+test border-4.1 {FreeBorderObjProc} {testborder failsOnUbuntu failsOnQuarz} {
destroy .b
set x [format purple]
button .b -bg $x -text .b1
diff --git a/tests/canvText.test b/tests/canvText.test
index f943525..1ad00dd 100644
--- a/tests/canvText.test
+++ b/tests/canvText.test
@@ -22,6 +22,7 @@ set ay [font metrics $font -linespace]
set ax [font measure $font 0]
testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] || ![string match Linux $::tcl_platform(os)]}]
+testConstraint failsOnQuarz [expr {![info exists ::env(MAC_CI)]}]
foreach test {
{-anchor nw nw xyz {bad anchor position "xyz": must be n, ne, e, se, s, sw, w, nw, or center}}
@@ -478,7 +479,7 @@ set font {Courier 12 italic}
set ax [font measure $font 0]
set ay [font metrics $font -linespace]
-test canvText-17.1 {TextToPostscript procedure} failsOnUbuntu {
+test canvText-17.1 {TextToPostscript procedure} {failsOnUbuntu failsOnQuarz} {
.c delete all
.c config -height 300 -highlightthickness 0 -bd 0
update
diff --git a/tests/color.test b/tests/color.test
index c65d6ee..143c339 100644
--- a/tests/color.test
+++ b/tests/color.test
@@ -9,6 +9,8 @@ package require tcltest 2.2
eval tcltest::configure $argv
tcltest::loadTestedCommands
+testConstraint failsOnQuarz [expr {![info exists ::env(MAC_CI)]}]
+
# cname --
# Returns a proper name for a color, given its intensities.
#
@@ -277,7 +279,7 @@ test color-3.4 {Tk_FreeColorFromObj - unlinking from list} colorsFree {
lappend result [testcolor purple]
} {{{4 1} {3 0} {2 0} {1 0}} {{4 1} {2 0} {1 0}} {{4 1} {2 0}} {{2 0}} {}}
-test color-4.1 {FreeColorObjProc} colorsFree {
+test color-4.1 {FreeColorObjProc} {colorsFree failsOnQuarz} {
destroy .b
set x [format purple]
button .b -foreground $x -text .b1
diff --git a/tests/cursor.test b/tests/cursor.test
index 90c308e..2abe2bc 100644
--- a/tests/cursor.test
+++ b/tests/cursor.test
@@ -11,6 +11,7 @@ eval tcltest::configure $argv
tcltest::loadTestedCommands
testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] || ![string match Linux $::tcl_platform(os)]}]
+testConstraint failsOnQuarz [expr {![info exists ::env(MAC_CI)]}]
test cursor-1.1 {Tk_AllocCursorFromObj - converting internal reps} {testcursor} {
set x watch
@@ -107,7 +108,7 @@ test cursor-3.1 {Tk_FreeCursorFromObj - reference counts} {testcursor} {
lappend result [testcursor heart]
} {{{3 1}} {{2 1}} {{1 1}} {}}
-test cursor-4.1 {FreeCursorObjProc} {testcursor failsOnUbuntu} {
+test cursor-4.1 {FreeCursorObjProc} {testcursor failsOnUbuntu failsOnQuarz} {
destroy .b
set x [format heart]
button .b -cursor $x
diff --git a/tests/font.test b/tests/font.test
index a35c4db..a44b194 100644
--- a/tests/font.test
+++ b/tests/font.test
@@ -18,6 +18,7 @@ update idletasks
set defaultfontlist [font names]
testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] || ![string match Linux $::tcl_platform(os)]}]
+testConstraint failsOnQuarz [expr {![info exists ::env(MAC_CI)]}]
proc getnondefaultfonts {} {
global defaultfontlist
@@ -630,7 +631,7 @@ test font-17.6 {Tk_FreeFont procedure: named font not deleted yet} {
list [lindex [font actual xyz] 0] [lindex $x 0]
} {-family -family}
-test font-18.1 {FreeFontObjProc} {testfont failsOnUbuntu} {
+test font-18.1 {FreeFontObjProc} {testfont failsOnUbuntu failsOnQuarz} {
destroy .b1
set x [format {Courier 12}]
button .b1 -font $x
@@ -1112,7 +1113,7 @@ test font-31.6 {Tk_IntersectTextLayout procedure: ignore spaces at eol} {
set x
} {}
-test font-32.1 {Tk_TextLayoutToPostscript: ensure buffer doesn't overflow} failsOnUbuntu {
+test font-32.1 {Tk_TextLayoutToPostscript: ensure buffer doesn't overflow} {failsOnUbuntu failsOnQuarz} {
# If there were a whole bunch of returns or tabs in a row, then the
# temporary buffer could overflow and write on the stack.
diff --git a/tests/text.test b/tests/text.test
index d06b8b3..d25285e 100644
--- a/tests/text.test
+++ b/tests/text.test
@@ -2582,7 +2582,7 @@ test text-20.167 {TextSearchCmd, regexp search multi-line} {
list [.t2 search -regexp -forward -all -count foo \
-- {(b+\nc+\nb+)\na+} 1.0] $foo
} {2.0 19}
-test text-20.168 {TextSearchCmd, regexp search multi-line} {knownBug} {
+test text-20.168 {TextSearchCmd, regexp search multi-line} knownBug {
deleteWindows
pack [text .t2]
.t2 insert 1.0 "aaaa\nbbbb\ncccc\nbbbb\naaaa\n"
@@ -2590,7 +2590,7 @@ test text-20.168 {TextSearchCmd, regexp search multi-line} {knownBug} {
list [.t2 search -regexp -forward -all -count foo \
-- {(a+|b+\nc+\nb+)\na+} 1.0] $foo
} {2.0 19}
-test text-20.169 {TextSearchCmd, regexp search multi-line} {knownBug} {
+test text-20.169 {TextSearchCmd, regexp search multi-line} knownBug {
deleteWindows
pack [text .t2]
.t2 insert 1.0 "aaaa\nbbbb\ncccc\nbbbb\naaaa\n"
@@ -2606,14 +2606,14 @@ test text-20.170 {TextSearchCmd, regexp search multi-line} {
list [.t2 search -regexp -forward -all -count foo \
-- {((a+|b+\nc+\nb+)+\n)+a+} 1.0] $foo
} {1.0 24}
-test text-20.171 {TextSearchCmd, regexp search multi-line} {knownBug} {
+test text-20.171 {TextSearchCmd, regexp search multi-line} knownBug {
deleteWindows
pack [text .t2]
.t2 insert 1.0 "aaaa\nbbbb\nbbbb\nbbbb\nbbbb\n"
list [.t2 search -regexp -backward -all -count foo \
-- {b+\n|a+\n(b+\n)+} end] $foo
} {1.0 25}
-test text-20.172 {TextSearchCmd, regexp search multi-line} {knownBug} {
+test text-20.172 {TextSearchCmd, regexp search multi-line} knownBug {
deleteWindows
pack [text .t2]
.t2 insert 1.0 "aaaa\nbbbb\nbbbb\nbbbb\nbbbb\n"
@@ -3333,7 +3333,7 @@ test text-27.2 {tabs - must be positive and must be increasing} {
pack [text .t -wrap none]
list [catch {.t configure -tabs {-5}} msg] $msg
} {1 {tab stop "-5" is not at a positive distance}}
-test text-27.3 {tabs - must be positive and must be increasing} {knownBug} {
+test text-27.3 {tabs - must be positive and must be increasing} knownBug {
# This bug will be fixed in Tk 9.0, when we can allow a minor
# incompatibility with Tk 8.x
destroy .t
diff --git a/tests/textWind.test b/tests/textWind.test
index 344687f..e377362 100644
--- a/tests/textWind.test
+++ b/tests/textWind.test
@@ -46,6 +46,7 @@ wm positionfrom . user
wm deiconify .
testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] || ![string match Linux $::tcl_platform(os)]}]
+testConstraint failsOnQuarz [expr {![info exists ::env(MAC_CI)]}]
test textWind-1.1 {basic tests of options} {fonts} {
.t delete 1.0 end
@@ -482,7 +483,7 @@ test textWind-10.5 {EmbWinLayoutProc procedure, error in creating window} {textf
update
lappend msg [.t bbox 1.5]
} [list {{can't embed .t relative to .t}} [list 40 [expr {11+$fixedDiff/2}] 0 0]]
-test textWind-10.6 {EmbWinLayoutProc procedure, error in creating window} {textfonts} {
+test textWind-10.6 {EmbWinLayoutProc procedure, error in creating window} {textfonts failsOnQuarz} {
.t delete 1.0 end
.t insert 1.0 "Some sample text"
catch {destroy .t2}
diff --git a/tests/ttk/ttk.test b/tests/ttk/ttk.test
index 0f69944..c242710 100644
--- a/tests/ttk/ttk.test
+++ b/tests/ttk/ttk.test
@@ -3,6 +3,8 @@ package require Tk 8.5
package require tcltest ; namespace import -force tcltest::*
loadTestedCommands
+testConstraint failsOnQuarz [expr {![info exists ::env(MAC_CI)]}]
+
proc skip args {}
proc ok {} { return }
@@ -202,7 +204,7 @@ test ttk-2.7 "instate scripts, true" -body {
set x
} -result 1
-test ttk-2.8 "bug 3223850: button state disabled during click" -setup {
+test ttk-2.8 "bug 3223850: button state disabled during click" -constraints failsOnQuarz -setup {
destroy .b
set ttk28 {}
pack [ttk::button .b -command {set ::ttk28 failed}]
diff --git a/tests/winWm.test b/tests/winWm.test
index 10e5ada..fc4298b 100644
--- a/tests/winWm.test
+++ b/tests/winWm.test
@@ -13,6 +13,7 @@ package require tcltest 2.2
eval tcltest::configure $argv
tcltest::loadTestedCommands
+testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] || ![string match Linux $::tcl_platform(os)]}]
testConstraint failsOnQuarz [expr {![info exists ::env(MAC_CI)]}]
# Measure the height of a single menu line
generated by cgit v0.12 at 2024-11-16 10:17:44 (GMT)