pack.test, scrollbar.test: correct "COMMON TEST SETUP" sections

Author: 1minus1is0

tests/pack.test

@@ -889,13 +889,10 @@ test pack-8.7 {insufficient space} -body {
 	[winfo geometry .pack.c] [winfo ismapped .pack.c]
 } -result {20x30+0+0 1 30x30+20+0 1 50x30+20+0 0}
 
-#
-# COMMON TEST SETUP
-#
-pack forget .pack.b
-update
-
-test pack-8.8 {insufficient space} -body {
+test pack-8.8 {insufficient space} -setup {
+    pack forget .pack.b
+    update
+} -body {
     list [winfo geometry .pack.a] [winfo ismapped .pack.a] \
 	[winfo geometry .pack.b] [winfo ismapped .pack.b] \
 	[winfo geometry .pack.c] [winfo ismapped .pack.c]

tests/scrollbar.test

@@ -337,25 +337,22 @@ test scrollbar-3.41 {ScrollbarWidgetCmd procedure, "fraction" option} {
     format {%.6g} [.t.s fraction 100 0]
 } {0.5}
 
-#
-# COMMON TEST SETUP
-#
-if {[testConstraint testmetrics]} {
-    # Only Windows has [testmetrics]
-    place configure .t.s -width [expr {2*[testmetrics cxhscroll .t.s]+1}]
-} else {
-    if {[tk windowingsystem] eq "x11"} {
-	place configure .t.s -width [expr {[winfo height .t.s] - 2*([.t.s cget -highlightthickness] + [.t.s cget -bd] + 1)}]
+test scrollbar-3.42 {ScrollbarWidgetCmd procedure, "fraction" option} -setup {
+    if {[testConstraint testmetrics]} {
+	# Only Windows has [testmetrics]
+	place configure .t.s -width [expr {2*[testmetrics cxhscroll .t.s]+1}]
     } else {
-	# macOS aqua
-	place configure .t.s -width [expr {2*([.t.s cget -highlightthickness] + [.t.s cget -bd])}]
+	if {[tk windowingsystem] eq "x11"} {
+	    place configure .t.s -width [expr {[winfo height .t.s] - 2*([.t.s cget -highlightthickness] + [.t.s cget -bd] + 1)}]
+	} else {
+	    # macOS aqua
+	    place configure .t.s -width [expr {2*([.t.s cget -highlightthickness] + [.t.s cget -bd])}]
+	}
     }
-}
-update
-
-test scrollbar-3.42 {ScrollbarWidgetCmd procedure, "fraction" option} {
+    update
+} -body {
     format {%.6g} [.t.s fraction 100 0]
-} 0
+} -result 0
 
 #
 # COMMON TEST CLEANUP
@@ -721,10 +718,9 @@ test scrollbar-8.2 {TkScrollbarEventProc: recursive deletion} notAqua {
 } {1 0 1}
 
 #
-# COMMON TEST SETUP
+# COMMON TEST CLEANUP
 #
 
-set l [interp hidden]
 deleteWindows
 
 test scrollbar-9.1 {scrollbar widget vs hidden commands} {
@@ -733,7 +729,7 @@ test scrollbar-9.1 {scrollbar widget vs hidden commands} {
     interp hide {} .s
     destroy .s
     list [winfo children .] [interp hidden]
-} [list {} $l]
+} [list {} [interp hidden]]
 
 test scrollbar-10.1 {<MouseWheel> event on scrollbar} -setup {
     destroy .t .s