summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2003-11-05 20:52:38 (GMT)
committerdgp <dgp@users.sourceforge.net>2003-11-05 20:52:38 (GMT)
commite5199821f0f325aaab89027b511707191fbe2b67 (patch)
treeb9b6cfff34bf9f514e751d6b1bdedf8ff7de4c0f /tests
parent27b9197dbd4ae5800d5d7745077b33b95a610160 (diff)
downloadtcl-e5199821f0f325aaab89027b511707191fbe2b67.zip
tcl-e5199821f0f325aaab89027b511707191fbe2b67.tar.gz
tcl-e5199821f0f325aaab89027b511707191fbe2b67.tar.bz2
* generic/tclEncoding.c (TclFindEncodings): Normalize the path
of the executable before passing to TclpInitLibraryPath() to avoid buggy handling of paths containing "..". [Bug 832657] * tests/unixInit.test (unixInit-2.10): New test for fixed bug.
Diffstat (limited to 'tests')
-rw-r--r--tests/unixInit.test36
1 files changed, 35 insertions, 1 deletions
diff --git a/tests/unixInit.test b/tests/unixInit.test
index 0f01943..4c1b37e 100644
--- a/tests/unixInit.test
+++ b/tests/unixInit.test
@@ -10,7 +10,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: unixInit.test,v 1.30 2002/12/04 07:07:40 hobbs Exp $
+# RCS: @(#) $Id: unixInit.test,v 1.30.2.1 2003/11/05 20:52:39 dgp Exp $
package require tcltest 2
namespace import -force ::tcltest::*
@@ -266,6 +266,40 @@ test unixInit-2.9 {TclpInitLibraryPath: paths relative to executable} {unix noSp
set x
} [list /tmp/lib/tcl[info tclversion] /lib/tcl[info tclversion] \
/tmp/library /library /tcl[info patchlevel]/library]
+
+test unixInit-2.10 {TclpInitLibraryPath: executable relative} -constraints {
+ unixOnly stdio
+} -setup {
+ set tmpDir [makeDirectory tmp]
+ set sparklyDir [makeDirectory sparkly $tmpDir]
+ set execPath [file join [makeDirectory bin $sparklyDir] tcltest]
+ file copy [interpreter] $execPath
+ set libDir [makeDirectory lib $sparklyDir]
+ set scriptDir [makeDirectory tcl[info tclversion] $libDir]
+ makeFile {} init.tcl $scriptDir
+ set saveDir [pwd]
+ cd $libDir
+} -body {
+ # Checking for Bug 832657
+ lrange [getlibpath [file join .. bin tcltest]] 2 3
+} -cleanup {
+ cd $saveDir
+ unset saveDir
+ removeFile init.tcl $scriptDir
+ unset scriptDir
+ removeDirectory tcl[info tclversion] $libDir
+ unset libDir
+ file delete $execPath
+ unset execPath
+ removeDirectory bin $sparklyDir
+ removeDirectory lib $sparklyDir
+ unset sparklyDir
+ removeDirectory sparkly $tmpDir
+ unset tmpDir
+ removeDirectory tmp
+} -result [list [file join [temporaryDirectory] tmp sparkly library] \
+ [file join [temporaryDirectory] tmp library] ]
+
test unixInit-3.1 {TclpSetInitialEncodings} -constraints {
unixOnly stdio
} -body {