diff options
author | dgp <dgp@users.sourceforge.net> | 2005-11-18 19:27:19 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2005-11-18 19:27:19 (GMT) |
commit | 7291f73f9ff1c92f027cac39b3a180c8f34e7606 (patch) | |
tree | 61ef59d7668271b74482ae50dfdd35a6dad34a3b /tests | |
parent | 51192088f7bdc56358e0b514b4f62fde29a49efb (diff) | |
download | tcl-7291f73f9ff1c92f027cac39b3a180c8f34e7606.zip tcl-7291f73f9ff1c92f027cac39b3a180c8f34e7606.tar.gz tcl-7291f73f9ff1c92f027cac39b3a180c8f34e7606.tar.bz2 |
* generic/tclPkg.c: Revised Bug 1162286 fix from 2005-11-08
* tests/pkg.test: to be more forgiving of package version
mismatch errors in [package ifneeded] commands. This reduces the
***POTENTIAL INCOMPATIBILITY*** noted for that change.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/pkg.test | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/tests/pkg.test b/tests/pkg.test index 74f91be..0a7833f 100644 --- a/tests/pkg.test +++ b/tests/pkg.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: pkg.test,v 1.9.12.1 2005/11/08 18:28:56 dgp Exp $ +# RCS: @(#) $Id: pkg.test,v 1.9.12.2 2005/11/18 19:27:19 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2 @@ -351,6 +351,22 @@ test pkg-2.34 {Tcl_PkgRequire: consistent return values (1162286)} -setup { package require foo 1 } -cleanup { package forget foo +} -match glob -result 1.1 -errorOutput {attempt to provide package * failed:*} +test pkg-2.34.1 {Tcl_PkgRequire: consistent return values (1162286)} -setup { + package forget foo +} -body { + package ifneeded foo 1.1 {package provide foo 1} + package require foo 1 +} -cleanup { + package forget foo +} -match glob -result 1 -errorOutput {attempt to provide package * failed:*} +test pkg-2.34.2 {Tcl_PkgRequire: consistent return values (1162286)} -setup { + package forget foo +} -body { + package ifneeded foo 1.1 {package provide foo 1} + package require foo 1.1 +} -cleanup { + package forget foo } -returnCodes error -match glob -result {attempt to provide package * failed:*} test pkg-2.35 {Tcl_PkgRequire: consistent return values (1162286)} -setup { package forget foo |