From 6421b7b8b281a38b1fda0a422ef4990e8d5323e4 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 10 Dec 2020 09:41:09 +0000
Subject: RFE 548cd945d6: symlinks for Windows 10
---
win/tclWinFile.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 6cfeae1..9c2d14c 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -264,11 +264,16 @@ WinLink(
TclWinConvertError(GetLastError());
} else if (linkAction & TCL_CREATE_SYMBOLIC_LINK) {
- /*
- * Can't symlink files.
- */
+ if (CreateSymbolicLinkW(linkSourcePath, linkTargetPath,
+ 0x2 /* SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE */)) {
+ /*
+ * Success!
+ */
- Tcl_SetErrno(ENOTDIR);
+ return 0;
+ }
+
+ TclWinConvertError(GetLastError());
} else {
Tcl_SetErrno(ENODEV);
}
--
cgit v0.12
From 9a7583c2191aa650ad26a26ab89a94e644ac0240 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 14 Dec 2020 07:33:42 +0000
Subject: Fix [fe57ad096d97623e]: Fix test http-4.14 for tcl-8.6.11rc0
---
tests/http.test | 13 ++++++-------
tests/httpd | 10 ++++------
tests/httpold.test | 11 +++++------
3 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/tests/http.test b/tests/http.test
index d1b2d22..c45a45a 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -38,13 +38,10 @@ proc bgerror {args} {
puts stderr $errorInfo
}
-if {$::tcl_platform(os) eq "Darwin"} {
- # Name resolution often a problem on OSX; not focus of HTTP package anyway
- set HOST localhost
-} else {
- set HOST [info hostname]
-}
-
+# Do not use [info hostname].
+# Name resolution is often a problem on OSX; not focus of HTTP package anyway.
+# Also a problem on other platforms for http-4.14 (test with bad port number).
+set HOST localhost
set port 8010
set bindata "This is binary data\x0d\x0amore\x0dmore\x0amore\x00null"
catch {unset data}
@@ -81,6 +78,8 @@ if {[catch {package present Thread}] == 0 && [file exists $httpdFile]} {
unset port
return
} else {
+ # Running httpd in the current thread overwrites the values of port
+ # (here) and HOST (in the sourced server file).
set port [lindex [fconfigure $listen -sockname] 2]
}
}
diff --git a/tests/httpd b/tests/httpd
index 16e0382..4f5f600 100644
--- a/tests/httpd
+++ b/tests/httpd
@@ -10,12 +10,10 @@
#set httpLog 1
-if {$::tcl_platform(os) eq "Darwin"} {
- # Name resolution often a problem on OSX; not focus of HTTP package anyway
- set HOST localhost
-} else {
- set HOST [info hostname]
-}
+# Do not use [info hostname].
+# Name resolution is often a problem on OSX; not focus of HTTP package anyway.
+# Also a problem on other platforms for http-4.14 (test with bad port number).
+set HOST localhost
proc httpd_init {{port 8015}} {
socket -server httpdAccept $port
diff --git a/tests/httpold.test b/tests/httpold.test
index 1b07c90..e5d974c 100644
--- a/tests/httpold.test
+++ b/tests/httpold.test
@@ -33,18 +33,17 @@ if {[catch {package require http 1.0}]} {
}
}
-if {$::tcl_platform(os) eq "Darwin"} {
- # Name resolution often a problem on OSX; not focus of HTTP package anyway
- set HOST localhost
-} else {
- set HOST [info hostname]
-}
+# Do not use [info hostname].
+# Name resolution is often a problem on OSX; not focus of HTTP package anyway.
+# Also a problem on other platforms for http-4.14 (test with bad port number).
+set HOST localhost
set bindata "This is binary data\x0d\x0amore\x0dmore\x0amore\x00null"
catch {unset data}
##
## The httpd script implement a stub http server
+## Sourcing httpd overwrites the value of HOST.
##
source [file join [file dirname [info script]] httpd]
--
cgit v0.12
From 66bf4b493e6d83a2e1187c2538c56068a51ed7a2 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 14 Dec 2020 08:05:08 +0000
Subject: Fix [cb4d185ea57b8966]: Fix tests safe-* for tcl-8.6.11rc0
---
unix/Makefile.in | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/unix/Makefile.in b/unix/Makefile.in
index c3f09ba..0dbea6d 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -2105,6 +2105,19 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in $(M
cp -p $(TOP_DIR)/tests/*.test $(TOP_DIR)/tests/README \
$(TOP_DIR)/tests/httpd $(TOP_DIR)/tests/*.tcl \
$(DISTDIR)/tests
+ @mkdir $(DISTDIR)/tests/auto0
+ for i in auto1 auto2 ; \
+ do \
+ mkdir $(DISTDIR)/tests/auto0/$$i ;\
+ cp -p $(TOP_DIR)/tests/auto0/$$i/tclIndex $(TOP_DIR)/tests/auto0/$$i/*.tcl \
+ $(DISTDIR)/tests/auto0/$$i; \
+ done;
+ for i in modules modules/mod1 modules/mod2 ; \
+ do \
+ mkdir $(DISTDIR)/tests/auto0/$$i ;\
+ cp -p $(TOP_DIR)/tests/auto0/$$i/*.tm \
+ $(DISTDIR)/tests/auto0/$$i; \
+ done;
@mkdir $(DISTDIR)/win
cp $(TOP_DIR)/win/Makefile.in $(DISTDIR)/win
cp $(TOP_DIR)/win/configure.in $(TOP_DIR)/win/configure \
--
cgit v0.12
From ebf2863b94c39a39d4a7ffe1690e9b2340e72e4c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 14 Dec 2020 08:44:58 +0000
Subject: Fix C:\test\tcl8.6.11_rc0\win\..\generic\tclStubInit.c(107) : warning
C4761: integral size mismatch in argument; Only happening on 32-bit Windows
---
generic/tclStubInit.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 51e6a81..f05db0a 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -104,7 +104,7 @@ static mp_err TclBN_mp_div_ld(const mp_int *a, Tcl_WideUInt b, mp_int *c, Tcl_Wi
if ((b | (mp_digit)-1) != (mp_digit)-1) {
return MP_VAL;
}
- result = mp_div_d(a, b, c, (d ? &d2 : NULL));
+ result = mp_div_d(a, (mp_digit)b, c, (d ? &d2 : NULL));
if (d) {
*d = d2;
}
--
cgit v0.12
From 00280a4727b6e400151a977c9f84270a6938c456 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 15 Dec 2020 11:37:29 +0000
Subject: Protect fCmd-28.8 with constaint win10
---
tests/fCmd.test | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/tests/fCmd.test b/tests/fCmd.test
index efffe99..ab0d21d 100644
--- a/tests/fCmd.test
+++ b/tests/fCmd.test
@@ -24,6 +24,7 @@ testConstraint testsetplatform [llength [info commands testsetplatform]]
testConstraint testchmod [llength [info commands testchmod]]
testConstraint winVista 0
testConstraint win2000orXP 0
+testConstraint win10 0
# Don't know how to determine this constraint correctly
testConstraint notNetworkFilesystem 0
testConstraint reg 0
@@ -66,11 +67,13 @@ if {[testConstraint unix]} {
# Also used in winFCmd...
if {[testConstraint win]} {
if {[testConstraint nt] && $::tcl_platform(osVersion) >= 5.0} {
- if {$::tcl_platform(osVersion) >= 6.0} {
- testConstraint winVista 1
- } else {
- testConstraint win2000orXP 1
- }
+ if {$::tcl_platform(osVersion) >= 10.0} {
+ testConstraint win10 1
+ } elseif {$::tcl_platform(osVersion) >= 6.0} {
+ testConstraint winVista 1
+ } else {
+ testConstraint win2000orXP 1
+ }
}
}
@@ -2355,13 +2358,13 @@ test fCmd-28.7 {file link: source already exists} -setup {
} -returnCodes error -cleanup {
cd [workingDirectory]
} -result {could not create new link "abc.file": that path already exists}
-test fCmd-28.8 {file link} -constraints {linkFile win} -setup {
+test fCmd-28.8 {file link} -constraints {linkFile win10} -setup {
cd [temporaryDirectory]
} -body {
file link -symbolic abc.link abc.file
-} -returnCodes error -cleanup {
+} -cleanup {
cd [workingDirectory]
-} -result {could not create new link "abc.link" pointing to "abc.file": not a directory}
+} -result abc.file
test fCmd-28.9 {file link: success with file} -constraints {linkFile} -setup {
cd [temporaryDirectory]
file delete -force abc.link
--
cgit v0.12
From fe22db4eda2ba0aca32232f210b10c6a3caed7dd Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 16 Dec 2020 14:28:47 +0000
Subject: [testConstraint winVista] should be true on Windows 10 too
---
tests/fCmd.test | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/fCmd.test b/tests/fCmd.test
index ab0d21d..046fa17 100644
--- a/tests/fCmd.test
+++ b/tests/fCmd.test
@@ -65,11 +65,12 @@ if {[testConstraint unix]} {
}
# Also used in winFCmd...
-if {[testConstraint win]} {
- if {[testConstraint nt] && $::tcl_platform(osVersion) >= 5.0} {
+if {[testConstraint win] && [testConstraint nt]} {
+ if {$::tcl_platform(osVersion) >= 5.0} {
if {$::tcl_platform(osVersion) >= 10.0} {
testConstraint win10 1
- } elseif {$::tcl_platform(osVersion) >= 6.0} {
+ }
+ if {$::tcl_platform(osVersion) >= 6.0} {
testConstraint winVista 1
} else {
testConstraint win2000orXP 1
--
cgit v0.12