Merge 8.5

Mark io-46.1 and io-50.5 as "notOSX", since they sometimes fail in Travis

Author: jan.nijtmans

.travis.yml

@@ -119,19 +119,19 @@ jobs:
         - BUILD_DIR=unix
         - CFGOPT="--enable-symbols=mem"
 # Testing on Mac, various styles
-    - name: "macOS/Xcode 11.5/Shared"
+    - name: "macOS/Xcode 11.7/Shared"
       os: osx
-      osx_image: xcode11.5
+      osx_image: xcode11.7
       env:
         - BUILD_DIR=macosx
       install: []
       script: &mactest
         - make all
         # The styles=develop avoids some weird problems on OSX
         - make test styles=develop
-    - name: "macOS/Xcode 11.5/Shared/Unix-like"
+    - name: "macOS/Xcode 11.7/Shared/Unix-like"
       os: osx
-      osx_image: xcode11.5
+      osx_image: xcode11.7
       env:
         - BUILD_DIR=unix
 # Older MacOS versions

tests/chanio.test

@@ -44,6 +44,7 @@ namespace eval ::tcl::test::io {
     testConstraint testmainthread   [llength [info commands testmainthread]]
     testConstraint testservicemode  [llength [info commands testservicemode]]
     testConstraint knownMsvcBug [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match windows $::env(TRAVIS_OS_NAME)]}]
+    testConstraint notOSX [expr {$::tcl_platform(os) ne "Darwin"}]
 
     # You need a *very* special environment to do some tests.  In particular,
     # many file systems do not support large-files...
@@ -5721,7 +5722,7 @@ test chan-io-45.3 {DeleteFileEvent, cleanup on chan close} {fileevent} {
 
 # Execute these tests only if the "testfevent" command is present.
 
-test chan-io-46.1 {Tcl event loop vs multiple interpreters} {testfevent fileevent} {
+test chan-io-46.1 {Tcl event loop vs multiple interpreters} {testfevent fileevent notOSX} {
     testfevent create
     set script "set f \[[list open $path(foo) r]]\n"
     append script {
@@ -6479,7 +6480,7 @@ test chan-io-50.5 {testing handler deletion vs reentrant calls} -setup {
     set f [open $path(test1) w]
     chan close $f
     update
-} -constraints {testchannelevent testservicemode} -body {
+} -constraints {testchannelevent testservicemode notOSX} -body {
     proc notcalled {f} {
 	variable z
 	lappend z "notcalled was called!! $f"

tests/io.test

@@ -44,6 +44,7 @@ testConstraint testmainthread   [llength [info commands testmainthread]]
 testConstraint testobj		[llength [info commands testobj]]
 testConstraint testservicemode  [llength [info commands testservicemode]]
 testConstraint knownMsvcBug [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match windows $::env(TRAVIS_OS_NAME)]}]
+testConstraint notOSX [expr {$::tcl_platform(os) ne "Darwin"}]
 
 # You need a *very* special environment to do some tests.  In
 # particular, many file systems do not support large-files...
@@ -6023,7 +6024,7 @@ test io-45.3 {DeleteFileEvent, cleanup on close} {fileevent} {
 
 # Execute these tests only if the "testfevent" command is present.
 
-test io-46.1 {Tcl event loop vs multiple interpreters} {testfevent fileevent} {
+test io-46.1 {Tcl event loop vs multiple interpreters} {testfevent fileevent notOSX} {
     testfevent create
     set script "set f \[[list open $path(foo) r]]\n"
     append script {
@@ -6831,7 +6832,7 @@ test io-50.4 {testing handler deletion vs reentrant calls} -constraints {testcha
 } -cleanup {
     close $f
 } -result {{delrecursive calling recursive} {delrecursive deleting recursive}}
-test io-50.5 {testing handler deletion vs reentrant calls} -constraints {testchannelevent testservicemode} -setup {
+test io-50.5 {testing handler deletion vs reentrant calls} -constraints {testchannelevent testservicemode notOSX} -setup {
     file delete $path(test1)
 } -body {
     set f [open $path(test1) w]