diff options
| author | dgp <dgp@users.sourceforge.net> | 2003-10-06 17:26:59 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2003-10-06 17:26:59 (GMT) |
| commit | f0b3bab433064ab445e23607e9486f419e3ab8b5 (patch) | |
| tree | e4295924c7306e2422056e4a820765e98a81482d | |
| parent | ab075d4de6e44ed1a638b47cb4a287b5d9c47580 (diff) | |
| download | tcl-f0b3bab433064ab445e23607e9486f419e3ab8b5.zip tcl-f0b3bab433064ab445e23607e9486f419e3ab8b5.tar.gz tcl-f0b3bab433064ab445e23607e9486f419e3ab8b5.tar.bz2 | |
* tests/fCmd.test (fCmd-8.2): Test only that tilde-substitution
happens, not for any particular result. [Bug 685991]
* unix/tcl.m4 (SC_PATH_TCLCONFIG): Corrected search path so
that alpha and beta releases of Tcl are not favored. [Bug 608698]
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | tests/fCmd.test | 9 | ||||
| -rw-r--r-- | unix/tcl.m4 | 16 |
3 files changed, 26 insertions, 5 deletions
@@ -1,5 +1,11 @@ 2003-10-06 Don Porter <dgp@users.sourceforge.net> + * tests/fCmd.test (fCmd-8.2): Test only that tilde-substitution + happens, not for any particular result. [Bug 685991] + + * unix/tcl.m4 (SC_PATH_TCLCONFIG): Corrected search path so + that alpha and beta releases of Tcl are not favored. [Bug 608698] + * tests/reg.test: Corrected duplicate test names. * tests/resource.test: [Bugs 710370, 710358] diff --git a/tests/fCmd.test b/tests/fCmd.test index 8e4d265..cc293f4 100644 --- a/tests/fCmd.test +++ b/tests/fCmd.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: fCmd.test,v 1.26.2.2 2003/06/23 10:21:16 vincentdarley Exp $ +# RCS: @(#) $Id: fCmd.test,v 1.26.2.3 2003/10/06 17:27:00 dgp Exp $ # if {[lsearch [namespace children] ::tcltest] == -1} { @@ -669,10 +669,9 @@ test fCmd-8.1 {FileBasename: basename of ~user: argc == 1 && *path == ~} \ file delete -force td1 set result } "1 {error renaming \"~$user\" to \"td1/[file tail ~$user]\": permission denied}" -test fCmd-8.2 {FileBasename: basename of ~user: argc == 1 && *path == ~} \ - {unixOnly notRoot} { - file tail ~$user -} "$user" +test fCmd-8.2 {FileBasename: basename of ~user: argc == 1 && *path == ~} { + string equal [file tail ~$user] ~$user +} 0 test fCmd-8.3 {file copy and path translation: ensure correct error} { list [catch {file copy ~ [file join this file doesnt exist]} res] $res } [list 1 \ diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 728b03c..53a4615 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -44,10 +44,16 @@ AC_DEFUN(SC_PATH_TCLCONFIG, [ if test x"${ac_cv_c_tclconfig}" = x ; then for i in \ ../tcl \ + `ls -dr ../tcl[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \ + `ls -dr ../tcl[[8-9]].[[0-9]] 2>/dev/null` \ `ls -dr ../tcl[[8-9]].[[0-9]]* 2>/dev/null` \ ../../tcl \ + `ls -dr ../../tcl[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \ + `ls -dr ../../tcl[[8-9]].[[0-9]] 2>/dev/null` \ `ls -dr ../../tcl[[8-9]].[[0-9]]* 2>/dev/null` \ ../../../tcl \ + `ls -dr ../../../tcl[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \ + `ls -dr ../../../tcl[[8-9]].[[0-9]] 2>/dev/null` \ `ls -dr ../../../tcl[[8-9]].[[0-9]]* 2>/dev/null` ; do if test -f "$i/unix/tclConfig.sh" ; then ac_cv_c_tclconfig=`(cd $i/unix; pwd)` @@ -74,6 +80,8 @@ AC_DEFUN(SC_PATH_TCLCONFIG, [ if test x"${ac_cv_c_tclconfig}" = x ; then for i in \ ${srcdir}/../tcl \ + `ls -dr ${srcdir}/../tcl[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \ + `ls -dr ${srcdir}/../tcl[[8-9]].[[0-9]] 2>/dev/null` \ `ls -dr ${srcdir}/../tcl[[8-9]].[[0-9]]* 2>/dev/null` ; do if test -f "$i/unix/tclConfig.sh" ; then ac_cv_c_tclconfig=`(cd $i/unix; pwd)` @@ -140,10 +148,16 @@ AC_DEFUN(SC_PATH_TKCONFIG, [ if test x"${ac_cv_c_tkconfig}" = x ; then for i in \ ../tk \ + `ls -dr ../tk[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \ + `ls -dr ../tk[[8-9]].[[0-9]] 2>/dev/null` \ `ls -dr ../tk[[8-9]].[[0-9]]* 2>/dev/null` \ ../../tk \ + `ls -dr ../../tk[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \ + `ls -dr ../../tk[[8-9]].[[0-9]] 2>/dev/null` \ `ls -dr ../../tk[[8-9]].[[0-9]]* 2>/dev/null` \ ../../../tk \ + `ls -dr ../../../tk[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \ + `ls -dr ../../../tk[[8-9]].[[0-9]] 2>/dev/null` \ `ls -dr ../../../tk[[8-9]].[[0-9]]* 2>/dev/null` ; do if test -f "$i/unix/tkConfig.sh" ; then ac_cv_c_tkconfig=`(cd $i/unix; pwd)` @@ -168,6 +182,8 @@ AC_DEFUN(SC_PATH_TKCONFIG, [ if test x"${ac_cv_c_tkconfig}" = x ; then for i in \ ${srcdir}/../tk \ + `ls -dr ${srcdir}/../tk[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \ + `ls -dr ${srcdir}/../tk[[8-9]].[[0-9]] 2>/dev/null` \ `ls -dr ${srcdir}/../tk[[8-9]].[[0-9]]* 2>/dev/null` ; do if test -f "$i/unix/tkConfig.sh" ; then ac_cv_c_tkconfig=`(cd $i/unix; pwd)` |