Merge 8.6

3 files changed, 14 insertions, 12 deletions

diff --git a/.travis.yml b/.travis.yml
index ac340a6..9ccfc25 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -134,9 +134,9 @@ jobs:
         - BUILD_DIR=unix
         - CFGOPT="--enable-symbols=mem"
 # Testing on Mac, various styles
-    - name: "macOS/Clang/Xcode 11.5/Shared"
+    - name: "macOS/Clang/Xcode 11.7/Shared"
       os: osx
-      osx_image: xcode11.5
+      osx_image: xcode11.7
       env:
         - BUILD_DIR=macosx
       install: []
@@ -144,14 +144,14 @@ jobs:
         - make all
         # The styles=develop avoids some weird problems on OSX
         - make test styles=develop
-    - name: "macOS/Clang/Xcode 11.5/Shared/Unix-like"
+    - name: "macOS/Clang/Xcode 11.7/Shared/Unix-like"
       os: osx
-      osx_image: xcode11.5
+      osx_image: xcode11.7
       env:
         - BUILD_DIR=unix
-    - name: "macOS/Clang/Xcode 11.5/Shared/libtommath"
+    - name: "macOS/Clang/Xcode 11.7/Shared/libtommath"
       os: osx
-      osx_image: xcode11.5
+      osx_image: xcode11.7
       env:
         - BUILD_DIR=macosx
       install: []
@@ -160,9 +160,9 @@ jobs:
         homebrew:
           packages:
             - libtommath
-    - name: "macOS/Clang++/Xcode 11.5/Shared"
+    - name: "macOS/Clang++/Xcode 11.7/Shared"
       os: osx
-      osx_image: xcode11.5
+      osx_image: xcode11.7
       env:
         - BUILD_DIR=unix
         - CFGOPT="CC=clang++ --enable-framework CFLAGS=-Dregister=dont+use+register CPPFLAGS=-D__private_extern__=extern"
diff --git a/tests/chanio.test b/tests/chanio.test
index 4e6fcc1..820fd8a 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -43,6 +43,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...
@@ -5720,7 +5721,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 {
@@ -6478,7 +6479,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"
diff --git a/tests/io.test b/tests/io.test
index 000bdf1..4cce125 100644
--- a/tests/io.test
+++ b/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...
@@ -6087,7 +6088,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 {
@@ -6895,7 +6896,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]