summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2007-09-19 09:23:56 (GMT)
committerdgp <dgp@users.sourceforge.net>2007-09-19 09:23:56 (GMT)
commit5a81901027b82d89f66a96019c153b05eb839c3b (patch)
treedf242d80535462efe828de5bbba900053c0d54ca /tests
parentc305f5464ea3858ebfe9fe90c826fff383041cf2 (diff)
downloadtcl-5a81901027b82d89f66a96019c153b05eb839c3b.zip
tcl-5a81901027b82d89f66a96019c153b05eb839c3b.tar.gz
tcl-5a81901027b82d89f66a96019c153b05eb839c3b.tar.bz2
* generic/tclPkg.c: Backport fix for [1573844] to the
* tests/pkg.test: TCL_TIP268 sections.
Diffstat (limited to 'tests')
-rw-r--r--tests/pkg.test22
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/pkg.test b/tests/pkg.test
index 27902a9..c363e24 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.10 2007/02/22 20:25:29 andreas_kupries Exp $
+# RCS: @(#) $Id: pkg.test,v 1.9.12.11 2007/09/19 09:23:59 dgp Exp $
if {[lsearch [namespace children] ::tcltest] == -1} {
package require tcltest 2
@@ -154,7 +154,7 @@ test pkg-2.8-268 {Tcl_PkgRequire procedure, can't find suitable version} tip268
}
list [catch {package require -exact t 1.3} msg] $msg
-} {1 {can't find package t 1.3-1.4}}
+} {1 {can't find package t 1.3}}
test pkg-2.9 {Tcl_PkgRequire procedure, can't find suitable version} {
package forget t
package unknown {}
@@ -217,7 +217,7 @@ test pkg-2.13-268 {Tcl_PkgRequire procedure, "package unknown" support} tip268 {
package require -exact t 1.5
package unknown {}
set x
-} {t 1.5-1.6}
+} {t 1.5-1.5}
test pkg-2.14 {Tcl_PkgRequire procedure, "package unknown" support} {
proc pkgUnknown args {
@@ -321,7 +321,7 @@ test pkg-2.17-268 {Tcl_PkgRequire procedure, "package unknown" doesn't load pack
set result [list [catch {package require -exact t 1.5} msg] $msg $x]
package unknown {}
set result
-} {1 {can't find package t 1.5-1.6} {t 1.5-1.6}}
+} {1 {can't find package t 1.5} {t 1.5-1.5}}
test pkg-2.18 {Tcl_PkgRequire procedure, version checks} {
package forget t
package provide t 2.3
@@ -361,7 +361,7 @@ test pkg-2.24-268 {Tcl_PkgRequire procedure, version checks} tip268 {
package forget t
package provide t 2.3
list [catch {package require -exact t 2.2} msg] $msg
-} {1 {version conflict for package "t": have 2.3, need 2.2-2.3}}
+} {1 {version conflict for package "t": have 2.3, need 2.2}}
test pkg-2.25 {Tcl_PkgRequire procedure, error in ifneeded script} -body {
package forget t
package ifneeded t 2.1 {package provide t 2.1; error "ifneeded test" EI}
@@ -987,16 +987,16 @@ test pkg-7.10 {Tcl_PkgPresent procedure, unknown package} {
package forget t
list [catch {package present -exact t 2.4} msg] $msg
} {1 {package t 2.4 is not present}}
-test pkg-7.11 {Tcl_PackageCmd procedure, "present" option} {
+test pkg-7.11 {Tcl_PackageCmd procedure, "present" option} !tip268 {
list [catch {package present} msg] $msg
} {1 {wrong # args: should be "package present ?-exact? package ?version?"}}
-test pkg-7.12 {Tcl_PackageCmd procedure, "present" option} {
+test pkg-7.12 {Tcl_PackageCmd procedure, "present" option} !tip268 {
list [catch {package present a b c} msg] $msg
} {1 {wrong # args: should be "package present ?-exact? package ?version?"}}
-test pkg-7.13 {Tcl_PackageCmd procedure, "present" option} {
+test pkg-7.13 {Tcl_PackageCmd procedure, "present" option} !tip268 {
list [catch {package present -exact a b c} msg] $msg
} {1 {wrong # args: should be "package present ?-exact? package ?version?"}}
-test pkg-7.14 {Tcl_PackageCmd procedure, "present" option} {
+test pkg-7.14 {Tcl_PackageCmd procedure, "present" option} !tip268 {
list [catch {package present -bs a b} msg] $msg
} {1 {wrong # args: should be "package present ?-exact? package ?version?"}}
test pkg-7.15 {Tcl_PackageCmd procedure, "present" option} {
@@ -1005,10 +1005,10 @@ test pkg-7.15 {Tcl_PackageCmd procedure, "present" option} {
test pkg-7.16 {Tcl_PackageCmd procedure, "present" option} {
list [catch {package present -exact x a.b} msg] $msg
} {1 {expected version number but got "a.b"}}
-test pkg-7.17 {Tcl_PackageCmd procedure, "present" option} {
+test pkg-7.17 {Tcl_PackageCmd procedure, "present" option} !tip268 {
list [catch {package present -exact x} msg] $msg
} {1 {wrong # args: should be "package present ?-exact? package ?version?"}}
-test pkg-7.18 {Tcl_PackageCmd procedure, "present" option} {
+test pkg-7.18 {Tcl_PackageCmd procedure, "present" option} !tip268 {
list [catch {package present -exact} msg] $msg
} {1 {wrong # args: should be "package present ?-exact? package ?version?"}}