Merge 8.6: fix testing and build issues on the various supported versions of macOS.

1 files changed, 8 insertions, 15 deletions

diff --git a/tests/canvImg.test b/tests/canvImg.test
index 0e0b47a..a6e9517 100644
--- a/tests/canvImg.test
+++ b/tests/canvImg.test
@@ -174,7 +174,7 @@ test canvImg-4.2 {ConfigureImage procedure} -constraints testImageType -setup {
     while {"timed out" ni $y && [lindex $y end 1] ne "display"} {
         vwait y
     }
-    after cancel timer
+    after cancel $timer
     list $x $y [.c bbox i1]
 } -cleanup {
     .c delete all
@@ -739,7 +739,6 @@ test canvImg-10.1 {TranslateImage procedure} -constraints testImageType -setup {
     foo changed 2 4 6 8 30 15
     vwait x
     after cancel $timer
-    update
     return $x
 } -cleanup {
     .c delete all
@@ -756,7 +755,7 @@ test canvImg-11.1 {TranslateImage procedure} -constraints testImageType -setup {
     set x {}
     set timer [after 500 {lappend x "timed out"}]
     foo changed 2 4 6 8 40 50
-        vwait x
+    vwait x
     after cancel $timer
     update
     return $x
@@ -779,17 +778,12 @@ test canvImg-11.2 {ImageChangedProc procedure} -constraints {
 	.c delete all
 	image delete foo
 } -result {30 75 70 125}
-if {[tk windowingsystem] == "aqua" && $tcl_platform(osVersion) > 18} {
-    # Aqua >= 10.14 will redraw the entire image.
-    set result_11_3 {{foo2 display 0 0 80 60}}
-} else {
-    set result_11_3 {{foo2 display 0 0 20 40}}
-}
+
 test canvImg-11.3 {ImageChangedProc procedure} -constraints {
 	testImageType
 } -setup {
     .c delete all
-    update
+    update idletasks
 } -body {
     image create test foo -variable x
     image create test foo2 -variable z
@@ -797,17 +791,16 @@ test canvImg-11.3 {ImageChangedProc procedure} -constraints {
     foo2 changed 0 0 0 0 80 60
     .c create image 50 100 -image foo -tags image -anchor nw
     .c create image 70 110 -image foo2 -anchor nw
-    update idletasks
     set z {}
     set timer [after 500 {lappend z "timed out"}]
-    image create test foo -variable x
-    vwait x
+    image delete foo
+    vwait z
     after cancel $timer
     return $z
 } -cleanup {
     .c delete all
-    image delete foo foo2
-} -result $result_11_3
+    image delete foo2
+} -result {{foo2 display 0 0 80 60}}
 
 # cleanup
 imageFinish