Eradicate constraint noExceed. This was originally introduced in [73e913a6] where the comment there explained the reason why the constraint was built on a command that should return an error (i.e. font actual \{xyz) but didn't under Exceed. Let's get rid of this relic from the past, I'm sure nobody runs the test suite under unix from Exceed.

4 files changed, 12 insertions, 14 deletions

diff --git a/tests/constraints.tcl b/tests/constraints.tcl
index ad0ca85..2ff42cd 100644
--- a/tests/constraints.tcl
+++ b/tests/constraints.tcl
@@ -269,9 +269,7 @@ testConstraint nonUnixUserInteraction [expr {
 }]
 testConstraint haveDISPLAY [expr {[info exists env(DISPLAY)] && [testConstraint x11]}]
 testConstraint altDisplay  [info exists env(TK_ALT_DISPLAY)]
-testConstraint noExceed [expr {
-    ![testConstraint unix] || [catch {font actual "\{xyz"}]
-}]
+
 # constraint for running a test on all windowing system except aqua
 # where the test fails due to a known bug
 testConstraint aquaKnownBug [expr {[testConstraint notAqua] || [testConstraint knownBug]}]
diff --git a/tests/font.test b/tests/font.test
index 69d3b15..ab1f172 100644
--- a/tests/font.test
+++ b/tests/font.test
@@ -130,7 +130,7 @@ test font-4.6 {font command: actual: arguments} -body {
     # (objc - skip > 4) when skip == 2
     font actual xyz -displayof . abc def
 } -returnCodes error -result {wrong # args: should be "font actual font ?-displayof window? ?option? ?--? ?char?"}
-test font-4.7 {font command: actual: arguments} -constraints noExceed -body {
+test font-4.7 {font command: actual: arguments} -body {
     # (tkfont == NULL)
     font actual "\{xyz"
 } -returnCodes error -result "font \"{xyz\" doesn't exist"
@@ -138,7 +138,7 @@ test font-4.8 {font command: actual: all attributes} -body {
     # not (objc > 3) so objPtr = NULL
     lindex [font actual {-family times}] 0
 } -result {-family}
-test font-4.9 {font command: actual} -constraints {unix noExceed failsOnUbuntu} -body {
+test font-4.9 {font command: actual} -constraints {unix failsOnUbuntu} -body {
     # (objc > 3) so objPtr = objv[3 + skip]
     string tolower [font actual {-family times} -family]
 } -result {times}
@@ -402,7 +402,7 @@ test font-9.3 {font command: measure: arguments} -body {
     # (objc - skip != 4)
     font measure xyz abc def
 } -returnCodes error -result {wrong # args: should be "font measure font ?-displayof window? text"}
-test font-9.4 {font command: measure: arguments} -constraints noExceed -body {
+test font-9.4 {font command: measure: arguments} -body {
     # (tkfont == NULL)
     font measure "\{xyz" abc
 } -returnCodes error -result "font \"{xyz\" doesn't exist"
@@ -440,7 +440,7 @@ test font-10.5 {font command: metrics: arguments} -body {
     # (objc - skip) > 4) when skip == 2
     font metrics xyz -displayof . abc
 } -returnCodes error -result {bad metric "abc": must be -ascent, -descent, -linespace, or -fixed}
-test font-10.6 {font command: metrics: bad font} -constraints noExceed -body {
+test font-10.6 {font command: metrics: bad font} -body {
     # (tkfont == NULL)
     font metrics "\{xyz"
 } -returnCodes error -result "font \"{xyz\" doesn't exist"
@@ -701,7 +701,7 @@ test font-15.9 {Tk_AllocFontFromObj procedure: get attribute font} -setup {
 } -cleanup {
 	destroy .t.f
 } -returnCodes error -result {expected integer but got "yyy"}
-test font-15.10 {Tk_AllocFontFromObj procedure: no match} -constraints noExceed -body {
+test font-15.10 {Tk_AllocFontFromObj procedure: no match} -body {
     # (ParseFontNameObj() != TCL_OK)
     font actual "\{xyz"
 } -returnCodes error -result "font \"{xyz\" doesn't exist"
@@ -2244,10 +2244,10 @@ test font-38.5 {ParseFontNameObj procedure: begins with *} -body {
 test font-38.6 {ParseFontNameObj procedure: begins with *} -body {
     font actual *-times-xyz -family
 } -result [font actual {times 0} -family]
-test font-38.7 {ParseFontNameObj procedure: arguments} -constraints noExceed -body {
+test font-38.7 {ParseFontNameObj procedure: arguments} -body {
     font actual "\{xyz"
 } -returnCodes error -result "font \"{xyz\" doesn't exist"
-test font-38.8 {ParseFontNameObj procedure: arguments} -constraints noExceed -body {
+test font-38.8 {ParseFontNameObj procedure: arguments} -body {
     font actual ""
 } -returnCodes error -result {font "" doesn't exist}
 test font-38.9 {ParseFontNameObj procedure: arguments} -body {
@@ -2347,7 +2347,7 @@ test font-44.1 {TkFontGetPixels: size < 0} -constraints failsOnUbuntu -setup {
 } -cleanup {
     tk scaling $oldscale
 } -result 24
-test font-44.2 {TkFontGetPoints: size >= 0} -constraints {noExceed haveTimes12Font} -setup {
+test font-44.2 {TkFontGetPoints: size >= 0} -constraints {haveTimes12Font} -setup {
     set oldscale [tk scaling]
 } -body {
     tk scaling 0.5
@@ -2363,7 +2363,7 @@ test font-45.1 {TkFontGetAliasList: no match} -body {
 test font-45.2 {TkFontGetAliasList: match} -constraints win -body {
     font actual {times 10} -family
 } -result {Times New Roman}
-test font-45.3 {TkFontGetAliasList: match} -constraints {noExceed failsOnUbuntu} -body {
+test font-45.3 {TkFontGetAliasList: match} -constraints {failsOnUbuntu} -body {
     if {[font actual {{times new roman} 10} -family] eq "Times New Roman"} {
         # avoid test failure on systems that have a real "times new roman" font
         set res 1
diff --git a/tests/select.test b/tests/select.test
index 2177591..bc41ce5 100644
--- a/tests/select.test
+++ b/tests/select.test
@@ -1007,7 +1007,7 @@ test select-10.3 {ConvertSelection procedure} -constraints x11 -setup {
 # testing timers
 # This one hangs in Exceed
 test select-10.4 {ConvertSelection procedure} -constraints {
-    x11 noExceed failsOnUbuntu
+    x11 failsOnUbuntu
 } -setup {
     setup
     setupbg
diff --git a/tests/unixFont.test b/tests/unixFont.test
index 3aeaa22..8985598 100644
--- a/tests/unixFont.test
+++ b/tests/unixFont.test
@@ -69,7 +69,7 @@ proc getsize {} {
     return "[winfo reqwidth .b.l] [winfo reqheight .b.l]"
 }
 
-test unixfont-1.1 {TkpGetNativeFont procedure: not native} {x11 noExceed} {
+test unixfont-1.1 {TkpGetNativeFont procedure: not native} {x11} {
     list [catch {font measure {} xyz} msg] $msg
 } {1 {font "" doesn't exist}}
 test unixfont-1.2 {TkpGetNativeFont procedure: native} {x11 failsOnUbuntu} {