Enhance previous commit: Without Xft also, check availability of the required font.

1 files changed, 4 insertions, 6 deletions

diff --git a/tests/unixFont.test b/tests/unixFont.test
index e7b96aa..f593fa9 100644
--- a/tests/unixFont.test
+++ b/tests/unixFont.test
@@ -33,16 +33,16 @@ foreach {constraint font} {
     hasCourierNew "courier new"
     hasTimesNew   "times new roman"
 } {
+    testConstraint $constraint 0
     if {([tk windowingsystem] eq "x11") && [llength $fontsystemcmd]} {
 	if {$withXft} {
-	    # check whether $font is available
-	    testConstraint $constraint 0
 	    if {[exec $fontsystemcmd $font family] ne ""} {
 	        testConstraint $constraint 1
 	    }
 	} else {
-	    # $font is supposed to be available by default
-	    testConstraint $constraint 1
+	    if {![catch {eval exec $fontsystemcmd [list *-$font-*]} res]} {
+	        testConstraint $constraint 1
+	    }
 	    if {![catch {eval exec $fontsystemcmd [list *-$font-*]} res]
 		    && ![string match *unmatched* $res]} {
 		# Newer Unix systems have more default fonts installed,
@@ -51,8 +51,6 @@ foreach {constraint font} {
 		testConstraint $constraint 0
 	    }
 	}
-    } else {
-	testConstraint $constraint 0
     }
 }