diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-14 08:11:11 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-14 08:11:11 (GMT) |
| commit | 14cf327d37f8aacea790129b8bdd4e497bc47981 (patch) | |
| tree | acce4aab4c9f975c1ecd82b85f4bdeedd9d2fab6 | |
| parent | 56c8c7f4a2740ed010d79e0de78b0f1ed9d88c82 (diff) | |
| parent | 66bf4b493e6d83a2e1187c2538c56068a51ed7a2 (diff) | |
| download | tcl-14cf327d37f8aacea790129b8bdd4e497bc47981.zip tcl-14cf327d37f8aacea790129b8bdd4e497bc47981.tar.gz tcl-14cf327d37f8aacea790129b8bdd4e497bc47981.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | tests/http.test | 11 | ||||
| -rw-r--r-- | tests/httpd | 10 | ||||
| -rw-r--r-- | unix/Makefile.in | 13 |
3 files changed, 21 insertions, 13 deletions
diff --git a/tests/http.test b/tests/http.test index 4a07789..ff9fb78 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 bindata "This is binary data\x0d\x0amore\x0dmore\x0amore\x00null" catch {unset data} diff --git a/tests/httpd b/tests/httpd index 37343aa..43e9372 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}} { set s [socket -server httpdAccept $port] diff --git a/unix/Makefile.in b/unix/Makefile.in index 4d37704..7493f99 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -2290,6 +2290,19 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in gen 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.ac $(TOP_DIR)/win/configure \ |