Merge 8.6

3 files changed, 5 insertions, 69 deletions

diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl
index 33ad322..7dc75d7 100644
--- a/library/tcltest/tcltest.tcl
+++ b/library/tcltest/tcltest.tcl
@@ -3084,7 +3084,7 @@ proc tcltest::makeFile {contents name {directory ""}} {
     fconfigure $fd -translation lf
     if {[package vsatisfies [package provide Tcl] 8.7-]} {
 	fconfigure $fd -encoding utf-8
-    } 
+    }
     if {[string index $contents end] eq "\n"} {
 	puts -nonewline $fd $contents
     } else {
diff --git a/tests/parseOld.test b/tests/parseOld.test
index ae087f4..8a58fbb 100644
--- a/tests/parseOld.test
+++ b/tests/parseOld.test
@@ -460,72 +460,6 @@ expr 1+1
 ]"
 } {2}
 
-test parseOld-14.1 {TclWordEnd procedure} {testwordend} {
-    testwordend " 	\n abc"
-} {c}
-test parseOld-14.2 {TclWordEnd procedure} {testwordend} {
-    testwordend "   \\\n"
-} {}
-test parseOld-14.3 {TclWordEnd procedure} {testwordend} {
-    testwordend "   \\\n "
-} { }
-test parseOld-14.4 {TclWordEnd procedure} {testwordend} {
-    testwordend {"abc"}
-} {"}
-#" Emacs formatting :^(
-test parseOld-14.5 {TclWordEnd procedure} {testwordend} {
-    testwordend {{xyz}}
-} \}
-test parseOld-14.6 {TclWordEnd procedure} {testwordend} {
-    testwordend {{a{}b{}\}} xyz}
-} "\} xyz"
-test parseOld-14.7 {TclWordEnd procedure} {testwordend} {
-    testwordend {abc[this is a]def ghi}
-} {f ghi}
-test parseOld-14.8 {TclWordEnd procedure} {testwordend} {
-    testwordend "puts\\\n\n  "
-} "s\\\n\n  "
-test parseOld-14.9 {TclWordEnd procedure} {testwordend} {
-    testwordend "puts\\\n   	"
-} "s\\\n   	"
-test parseOld-14.10 {TclWordEnd procedure} {testwordend} {
-    testwordend "puts\\\n   	xyz"
-} "s\\\n   	xyz"
-test parseOld-14.11 {TclWordEnd procedure} {testwordend} {
-    testwordend {a$x.$y(a long index) foo}
-} ") foo"
-test parseOld-14.12 {TclWordEnd procedure} {testwordend} {
-    testwordend {abc; def}
-} {; def}
-test parseOld-14.13 {TclWordEnd procedure} {testwordend} {
-    testwordend {abc def}
-} {c def}
-test parseOld-14.14 {TclWordEnd procedure} {testwordend} {
-    testwordend {abc	def}
-} {c	def}
-test parseOld-14.15 {TclWordEnd procedure} {testwordend} {
-    testwordend "abc\ndef"
-} "c\ndef"
-test parseOld-14.16 {TclWordEnd procedure} {testwordend} {
-    testwordend "abc"
-} {c}
-test parseOld-14.17 {TclWordEnd procedure} {testwordend} {
-    testwordend "a\000bc"
-} {c}
-test parseOld-14.18 {TclWordEnd procedure} {testwordend} {
-    testwordend \[a\000\]
-} {]}
-test parseOld-14.19 {TclWordEnd procedure} {testwordend} {
-    testwordend \"a\000\"
-} {"}
-#" Emacs formatting :^(
-test parseOld-14.20 {TclWordEnd procedure} {testwordend} {
-    testwordend a{\000}b
-} {b}
-test parseOld-14.21 {TclWordEnd procedure} {testwordend} {
-    testwordend "   \000b"
-} {b}
-
 test parseOld-15.1 {TclScriptEnd procedure} {
     info complete {puts [
 	expr 1+1
diff --git a/tests/socket.test b/tests/socket.test
index b67d1b9..51014aa 100644
--- a/tests/socket.test
+++ b/tests/socket.test
@@ -299,6 +299,8 @@ proc getPort sock {
 # Some tests in this file are known to hang *occasionally* on OSX; stop the
 # worst offenders.
 testConstraint notOSX [expr {$::tcl_platform(os) ne "Darwin"}]
+# Here "Windows" means derived platforms as Cygwin or Msys2 too.
+testConstraint notWindows [expr {![regexp {^(Windows|MSYS|CYGWIN)} $::tcl_platform(os)]}]
 
 # ----------------------------------------------------------------------
 
@@ -941,7 +943,7 @@ test socket_$af-5.1 {byte order problems, socket numbers, htons} -body {
         return {htons problem, should be disallowed, are you running as SU?}
     }
     return {couldn't open socket: not owner}
-} -constraints [list socket supported_$af unix notRoot notOSX] -result {couldn't open socket: not owner}
+} -constraints [list socket supported_$af unix notRoot notOSX notWindows] -result {couldn't open socket: not owner}
 test socket_$af-5.2 {byte order problems, socket numbers, htons} -body {
     if {![catch {socket -server dodo 0x10000} msg]} {
 	close $msg
@@ -955,7 +957,7 @@ test socket_$af-5.3 {byte order problems, socket numbers, htons} -body {
 	return {htons problem, should be disallowed, are you running as SU?}
     }
     return {couldn't open socket: not owner}
-} -constraints [list socket supported_$af unix notRoot notOSX] -result {couldn't open socket: not owner}
+} -constraints [list socket supported_$af unix notRoot notOSX notWindows] -result {couldn't open socket: not owner}
 
 test socket_$af-6.1 {accept callback error} -constraints [list socket supported_$af stdio] -setup {
     proc myHandler {msg options} {