Merge 8.7

4 files changed, 20 insertions, 6 deletions

diff --git a/tests/chanio.test b/tests/chanio.test
index 69f9690..6173d0d 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -4535,7 +4535,7 @@ test chan-io-34.20 {Tcl_Tell combined with writing} -setup {
 test chan-io-34.21 {Tcl_Seek and Tcl_Tell on large files} -setup {
     file delete $path(test3)
     set l ""
-} -constraints {largefileSupport} -body {
+} -constraints {largefileSupport extensive} -body {
     set f [open $path(test3) w]
     chan configure $f -encoding binary
     lappend l [chan tell $f]
diff --git a/tests/fileSystem.test b/tests/fileSystem.test
index 5f841b5..a6238c2 100644
--- a/tests/fileSystem.test
+++ b/tests/fileSystem.test
@@ -577,7 +577,14 @@ test filesystem-7.1.1 {load from vfs} -setup {
     set dir [pwd]
 } -constraints {win testsimplefilesystem loaddll} -body {
     # This may cause a crash on exit
-    cd [file dirname $::ddelib]
+    if {[file dirname $::ddelib] ne "."} {
+	cd [file dirname $::ddelib]
+    } else {
+	cd [file dirname [info nameofexecutable]]
+    }
+    if {![file exists [file tail $::ddelib]]} {
+	::tcltest::Skip "no-ddelib"
+    }
     testsimplefilesystem 1
     # This loads dde via a complex copy-to-temp operation
     load simplefs:/[file tail $::ddelib] Dde
@@ -591,7 +598,14 @@ test filesystem-7.1.2 {load from vfs, and then unload again} -setup {
     set dir [pwd]
 } -constraints {win testsimplefilesystem loaddll} -body {
     # This may cause a crash on exit
-    cd [file dirname $::reglib]
+    if {[file dirname $::reglib] ne "."} {
+	cd [file dirname $::reglib]
+    } else {
+	cd [file dirname [info nameofexecutable]]
+    }
+    if {![file exists [file tail $::reglib]]} {
+	::tcltest::Skip "no-reglib"
+    }
     testsimplefilesystem 1
     # This loads reg via a complex copy-to-temp operation
     load simplefs:/[file tail $::reglib] Registry
diff --git a/tests/io.test b/tests/io.test
index 86a871b..5c0e5aa 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -4996,7 +4996,7 @@ test io-34.20 {Tcl_Tell combined with writing} {
     close $f
     set l
 } {29 39 40 447}
-test io-34.21 {Tcl_Seek and Tcl_Tell on large files} {largefileSupport} {
+test io-34.21 {Tcl_Seek and Tcl_Tell on large files} {largefileSupport extensive} {
     file delete $path(test3)
     set f [open $path(test3) w]
     fconfigure $f -encoding binary
diff --git a/tests/winFCmd.test b/tests/winFCmd.test
index ac5ae4e..69a3612 100644
--- a/tests/winFCmd.test
+++ b/tests/winFCmd.test
@@ -367,7 +367,7 @@ proc MakeFiles {dirname} {
     while {1} {
         # upped to 50K for 64bit Server 2008
         if {$ndx > 50000} {
-            return -code error "limit reached without finding a collistion."
+            tcltest::Skip "limit-reached:no-collistion"
         }
         set filename [file join $dirname Test[incr ndx]]
         set f [open $filename w]
@@ -383,7 +383,7 @@ proc MakeFiles {dirname} {
 
 test winFCmd-1.38 {TclpRenameFile: check rename of conflicting inodes} -setup {
     cleanup
-} -constraints {win winNonZeroInodes knownMsvcBug notInCIenv} -body {
+} -constraints {win winNonZeroInodes knownMsvcBug notInCIenv extensive} -body {
     file mkdir td1
     lassign [MakeFiles td1] a b
     file rename -force $a $b