Merge 8.6. Modify local xvfb-run script such that it works on macOS, and use it

1 files changed, 13 insertions, 13 deletions

diff --git a/tests/scrollbar.test b/tests/scrollbar.test
index ae938dc..097ab79 100644
--- a/tests/scrollbar.test
+++ b/tests/scrollbar.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -23,7 +23,7 @@ proc getTroughSize {w} {
 	    return [expr {[winfo height $w] - 2*[testmetrics cyvscroll $w]}]
 	} else {
 	    return [expr {[winfo width $w] - 2*[testmetrics cxhscroll $w]}]
-	}	    
+	}
     } else {
         if {[tk windowingsystem] eq "x11"} {
             # Calculations here assume that the arrow area is a square.
@@ -60,7 +60,7 @@ proc getTroughSize {w} {
 foreach {width height} [wm minsize .] {
     set height [expr {($height < 200) ? 200 : $height}]
     set width [expr {($width < 1) ? 1 : $width}]
-} 
+}
 
 frame .f -height $height -width $width
 pack .f -side left
@@ -380,15 +380,15 @@ test scrollbar-3.59 {ScrollbarWidgetCmd procedure, "set" option} {
     set result
 } {0.0 0.3}
 test scrollbar-3.60 {ScrollbarWidgetCmd procedure, "set" option} {
-    .s set 1.1 .4 
+    .s set 1.1 .4
     .s get
 } {1.0 1.0}
 test scrollbar-3.61 {ScrollbarWidgetCmd procedure, "set" option} {
-    .s set .5 -.3 
+    .s set .5 -.3
     .s get
 } {0.5 0.5}
 test scrollbar-3.62 {ScrollbarWidgetCmd procedure, "set" option} {
-    .s set .5 87 
+    .s set .5 87
     .s get
 } {0.5 1.0}
 test scrollbar-3.63 {ScrollbarWidgetCmd procedure, "set" option} {
@@ -412,15 +412,15 @@ test scrollbar-3.67 {ScrollbarWidgetCmd procedure, "set" option} {
     list [catch {.s set 1 2 3 jkl} msg] $msg
 } {1 {expected integer but got "jkl"}}
 test scrollbar-3.68 {ScrollbarWidgetCmd procedure, "set" option} {
-    .s set -10 50 20 30 
+    .s set -10 50 20 30
     .s get
 } {0 50 0 0}
 test scrollbar-3.69 {ScrollbarWidgetCmd procedure, "set" option} {
-    .s set 100 -10 20 30 
+    .s set 100 -10 20 30
     .s get
 } {100 0 20 30}
 test scrollbar-3.70 {ScrollbarWidgetCmd procedure, "set" option} {
-    .s set 100 50 30 20 
+    .s set 100 50 30 20
     .s get
 } {100 50 30 30}
 test scrollbar-3.71 {ScrollbarWidgetCmd procedure, "set" option} {
@@ -499,7 +499,7 @@ test scrollbar-6.12.2 {ScrollbarPosition procedure} aqua {
     .s identify 8 19
 } {trough1}
 test scrollbar-6.14 {ScrollbarPosition procedure} win {
-    .s identify [expr {[winfo width .s] / 2}] 0 
+    .s identify [expr {[winfo width .s] / 2}] 0
 } {arrow1}
 test scrollbar-6.15 {ScrollbarPosition procedure} {testmetrics win} {
     .s identify [expr {[winfo width .s] / 2}] [expr {[testmetrics cyvscroll .s] - 1}]
@@ -610,7 +610,7 @@ test scrollbar-6.41.2 {ScrollbarPosition procedure} aqua {
 } {trough2}
 test scrollbar-6.43 {ScrollbarPosition procedure} {testmetrics win} {
     .t.s identify [expr {int(.4 / [.t.s delta 1 0]) + [testmetrics cxhscroll .t.s]
-		       - 1}] [expr {[winfo height .t.s] / 2}] 
+		       - 1}] [expr {[winfo height .t.s] / 2}]
 } {slider}
 test scrollbar-6.44 {ScrollbarPosition procedure} unix {
     .t.s identify 100 18
@@ -759,7 +759,7 @@ test scrollbar-11.1 {bug fix: [011706ec42] Scrollbar unsafe wrt widget destructi
     update  ; # shall not trigger error  invalid command name ".top.s"
 } -cleanup {
     destroy .top.s .top
-} -result {} 
+} -result {}
 test scrollbar-11.2 {bug fix: [011706ec42] Scrollbar unsafe wrt widget destruction} -body {
     proc destroy_scrollbar {{y 0}} {
         if {[winfo exists .top.s]} {
@@ -778,7 +778,7 @@ test scrollbar-11.2 {bug fix: [011706ec42] Scrollbar unsafe wrt widget destructi
     update  ; # shall not trigger error  invalid command name ".top.s"
 } -cleanup {
     destroy .top.s .top
-} -result {} 
+} -result {}
 
 catch {destroy .s}
 catch {destroy .t}