Factorize definition of constraint haveBigFontTwiceLargerThanTextFont.

3 files changed, 8 insertions, 20 deletions

diff --git a/tests/constraints.tcl b/tests/constraints.tcl
index a506001..27bbd33 100644
--- a/tests/constraints.tcl
+++ b/tests/constraints.tcl
@@ -345,6 +345,12 @@ testConstraint haveTimes12BoldItalicUnderlineOverstrikeFont [expr {
     ([font actual {times 12 bold italic overstrike underline} -underline] eq "1") &&
     ([font actual {times 12 bold italic overstrike underline} -overstrike] eq "1")
 }]
+set fixedFont {Courier 12}   ; # warning: must be consistent with the files using the constraint below!
+set bigFont   {Helvetica 24} ; # ditto
+testConstraint haveBigFontTwiceLargerThanTextFont [expr {
+    [font actual $fixedFont -size] * 2 <= [font actual $bigFont -size]
+}]
+unset fixedFont bigFont
 
 # constraints for the visuals available
 testConstraint pseudocolor8 [expr {
diff --git a/tests/textDisp.test b/tests/textDisp.test
index 1749977..6edb47d 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -73,15 +73,6 @@ set bigFont {Helvetica -24}  ; # note: not a fixed-width font!
 set bigHeight [font metrics $bigFont -linespace]
 set bigAscent [font metrics $bigFont -ascent]
 
-# Although unexpected, this constraint happens to evaluate to false on at
-# least one system: the Github CI runner on Linux with --disable-xft
-# This is because this configuration only has ONE single font available,
-# making all requested fonts become actually the same font.
-# See constraints.tcl for more details.
-testConstraint haveBigFontTwiceLargerThanTextFont [expr {
-    [font actual $fixedFont -size] * 2 <= [font actual $bigFont -size]
-}]
-
 set ascentDiff [expr {$bigAscent - $fixedAscent}]
 set heightDiff [expr {$bigHeight - $fixedHeight}]
 
diff --git a/tests/textTag.test b/tests/textTag.test
index 186cf21..230bf18 100644
--- a/tests/textTag.test
+++ b/tests/textTag.test
@@ -11,17 +11,8 @@ namespace import ::tcltest::*
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
-set fixedFont     {Courier 12}
-set bigFont       {Helvetica 24}
-
-# Although unexpected, this constraint happens to evaluate to false on at
-# least one system: the Github CI runner on Linux with --disable-xft
-# This is because this configuration only has ONE single font available,
-# making all requested fonts become actually the same font.
-# See constraints.tcl for more details.
-testConstraint haveBigFontTwiceLargerThanTextFont [expr {
-    [font actual $fixedFont -size] * 2 <= [font actual $bigFont -size]
-}]
+set fixedFont {Courier 12}
+set bigFont   {Helvetica 24}
 
 # Warn the user if the actual font is too different from what was requested.
 if {[font metrics [font actual $fixedFont] -fixed] != 1} {