1 files changed, 11 insertions, 34 deletions

diff --git a/tests/imgPhoto.test b/tests/imgPhoto.test
index 4179f86..90aec24 100644
--- a/tests/imgPhoto.test
+++ b/tests/imgPhoto.test
@@ -27,23 +27,12 @@ README -- Tk test suite design document.
 set teapotPhotoFile [file join [file dirname [info script]] teapot.ppm]
 testConstraint hasTeapotPhoto [file exists $teapotPhotoFile]
 
-# - Tests 18.1-18.9 cause segfault on Tk 8.5 < 8.5.20.
-proc test18ok {} {
-    expr {
-            ([package vsatisfies $::tk_patchLevel 8.6])
-	 || (    ($::tk_version eq "8.5")
-              && ([package vcompare $::tk_patchLevel 8.5.20] == 1)
-	    )
-    }
-}
-
 proc base64ok {} {
     expr {
         ![catch {package require base64}]
     }
 }
 
-testConstraint SegfaultOn8.5 [test18ok]
 testConstraint base64PackageNeeded [base64ok]
 
 test imgPhoto-1.1 {options for photo images} {
@@ -744,10 +733,10 @@ test imgPhoto-16.1 {copying to self doesn't access freed memory} {
 } {}
 
 # Reject corrupted or truncated image [Bug b601ce3ab1].
-# WARNING - tests marked "SegfaultOn8.5" will cause a segfault on
-# 8.5.19 and lower.
+# WARNING - tests 18.1-18.9 will cause a segfault on 8.5.19 and lower,
+#           and on 8.6.6 and lower.
 test imgPhoto-18.1 {Reject corrupted GIF (binary string)} -constraints {
-    SegfaultOn8.5 base64PackageNeeded
+    base64PackageNeeded
 } -setup {
     package require base64
     set data [base64::decode {
@@ -759,9 +748,7 @@ test imgPhoto-18.1 {Reject corrupted GIF (binary string)} -constraints {
 } -cleanup {
     catch {image delete gif1}
 } -returnCodes error -result {error reading color map|not enough free memory for image buffer} -match regexp
-test imgPhoto-18.2 {Reject corrupted GIF (base 64 string)} -constraints {
-    SegfaultOn8.5
-} -setup {
+test imgPhoto-18.2 {Reject corrupted GIF (base 64 string)} -setup {
     set data {
 	R0lGODlhwjMz//8zM/8z/zP/MzP/////M////yH5CiwheLrcLTBCd6Tv2qW16tdK4jhV
 	5qpraXIvM1JlNyAgOw==
@@ -771,9 +758,7 @@ test imgPhoto-18.2 {Reject corrupted GIF (base 64 string)} -constraints {
 } -cleanup {
     catch {image delete gif1}
 } -returnCodes error -result {error reading color map|not enough free memory for image buffer} -match regexp
-test imgPhoto-18.3 {Reject corrupted GIF (file)} -constraints {
-    SegfaultOn8.5
-} -setup {
+test imgPhoto-18.3 {Reject corrupted GIF (file)} -setup {
     set fileName [file join [file dirname [info script]] corruptMangled.gif]
 } -body {
     image create photo gif1 -file $fileName
@@ -781,7 +766,7 @@ test imgPhoto-18.3 {Reject corrupted GIF (file)} -constraints {
     catch {image delete gif1}
 } -returnCodes error -result {error reading color map|not enough free memory for image buffer} -match regexp
 test imgPhoto-18.4 {Reject truncated GIF (binary string)} -constraints {
-    SegfaultOn8.5 base64PackageNeeded
+    base64PackageNeeded
 } -setup {
     package require base64
     set data [base64::decode {
@@ -792,9 +777,7 @@ test imgPhoto-18.4 {Reject truncated GIF (binary string)} -constraints {
 } -cleanup {
     catch {image delete gif1}
 } -returnCodes error -result {error reading color map}
-test imgPhoto-18.5 {Reject truncated GIF (base 64 string)} -constraints {
-    SegfaultOn8.5
-} -setup {
+test imgPhoto-18.5 {Reject truncated GIF (base 64 string)} -setup {
     set data {
 	R0lGODlhEAAQAMIHAAAAADMz//8zM/8z/zP/MzP///8=
     }
@@ -803,9 +786,7 @@ test imgPhoto-18.5 {Reject truncated GIF (base 64 string)} -constraints {
 } -cleanup {
     catch {image delete gif1}
 } -returnCodes error -result {error reading color map}
-test imgPhoto-18.6 {Reject truncated GIF (file)} -constraints {
-    SegfaultOn8.5
-} -setup {
+test imgPhoto-18.6 {Reject truncated GIF (file)} -setup {
     set fileName [file join [file dirname [info script]] corruptTruncated.gif]
 } -body {
     image create photo gif1 -file $fileName
@@ -813,7 +794,7 @@ test imgPhoto-18.6 {Reject truncated GIF (file)} -constraints {
     catch {image delete gif1}
 } -returnCodes error -result {error reading color map}
 test imgPhoto-18.7 {Reject corrupted GIF (> 4Gb) (binary string)} -constraints {
-    SegfaultOn8.5 base64PackageNeeded
+    base64PackageNeeded
 } -setup {
     package require base64
     set data [base64::decode {
@@ -825,9 +806,7 @@ test imgPhoto-18.7 {Reject corrupted GIF (> 4Gb) (binary string)} -constraints {
 } -cleanup {
     catch {image delete gif1}
 } -returnCodes error -result {error reading color map|not enough free memory for image buffer} -match regexp
-test imgPhoto-18.8 {Reject corrupted GIF (> 4Gb) (base 64 string)} -constraints {
-    SegfaultOn8.5
-} -setup {
+test imgPhoto-18.8 {Reject corrupted GIF (> 4Gb) (base 64 string)} -setup {
     set data {
 	R0lGODlhwmYz//8zM/8z/zP/MzP/////M////yH5Ciwhe
 	LrcLTBCd6Tv2qW16tdK4jhV5qpraXIvM1JlNyAgOw==
@@ -837,9 +816,7 @@ test imgPhoto-18.8 {Reject corrupted GIF (> 4Gb) (base 64 string)} -constraints
 } -cleanup {
     catch {image delete gif1}
 } -returnCodes error -result {error reading color map|not enough free memory for image buffer} -match regexp
-test imgPhoto-18.9 {Reject corrupted GIF (> 4Gb) (file)} -constraints {
-    SegfaultOn8.5
-} -setup {
+test imgPhoto-18.9 {Reject corrupted GIF (> 4Gb) (file)} -setup {
     set fileName [file join [file dirname [info script]] corruptMangled4G.gif]
 } -body {
     image create photo gif1 -file $fileName