summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorculler <culler>2019-05-28 13:41:28 (GMT)
committerculler <culler>2019-05-28 13:41:28 (GMT)
commit0d2e82859b96c50bc0575f299f97117c71b3d9a0 (patch)
treef3a951eb3381ee58d5f5f9aa42b51cc7ad732ed5 /tests
parent69bd7e67880eb32af6914a39f2247111b6c0b8e2 (diff)
downloadtk-0d2e82859b96c50bc0575f299f97117c71b3d9a0.zip
tk-0d2e82859b96c50bc0575f299f97117c71b3d9a0.tar.gz
tk-0d2e82859b96c50bc0575f299f97117c71b3d9a0.tar.bz2
When running textDisp.test on Aqua use Courier as the fixed font since
Courier New has different metrics.
Diffstat (limited to 'tests')
-rw-r--r--tests/textDisp.test10
1 files changed, 9 insertions, 1 deletions
diff --git a/tests/textDisp.test b/tests/textDisp.test
index b74fc4a..94e0184 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -41,7 +41,15 @@ catch {destroy .f .t}
frame .f -width 100 -height 20
pack .f -side left
-set fixedFont {"Courier New" -12}
+# On macOS the font "Courier New" has different metrics than "Courier",
+# and this causes tests 20.1 - 20.5 to fail. So we use "Courier" as the
+# fixed font for testing on Aqua.
+
+if {[tk windowingsystem] eq "aqua"} {
+ set fixedFont {Courier -12}
+} else {
+ set fixedFont {"Courier New" -12}
+}
# 15 on XP, 13 on Solaris 8
set fixedHeight [font metrics $fixedFont -linespace]
# 7 on all platforms