summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--tests/load.test7
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index cdbd5ad..c2f5a8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-15 Daniel Steffen <das@users.sourceforge.net>
+
+ * tests/load.test (load-2.3): adopted fix for failure on darwin
+ from HEAD.
+
2004-09-14 Don Porter <dgp@users.sourceforge.net>
* generic/tclObj.c (Tcl_GetIntFromObj): Corrected flaw in returning
diff --git a/tests/load.test b/tests/load.test
index bd480b9..9fe26ab 100644
--- a/tests/load.test
+++ b/tests/load.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: load.test,v 1.11 2003/02/01 23:37:29 kennykb Exp $
+# RCS: @(#) $Id: load.test,v 1.11.2.1 2004/09/14 17:02:56 das Exp $
if {[lsearch [namespace children] ::tcltest] == -1} {
package require tcltest 2
@@ -78,9 +78,10 @@ test load-2.2 {loading into a safe interpreter, with package name conversion} \
list [child eval pkgb_sub 44 13] [catch {child eval pkgb_unsafe} msg] $msg \
[catch {pkgb_sub 12 10} msg2] $msg2
} {31 1 {invalid command name "pkgb_unsafe"} 1 {invalid command name "pkgb_sub"}}
-test load-2.3 {loading with no _Init procedure} [list $dll $loaded] {
+test load-2.3 {loading with no _Init procedure} -constraints [list $dll $loaded] \
+-body {
list [catch {load [file join $testDir pkgc$ext] foo} msg] $msg
-} {1 {couldn't find procedure Foo_Init}}
+} -match glob -result {1 {*couldn't find procedure Foo_Init}}
test load-2.4 {loading with no _SafeInit procedure} [list $dll $loaded] {
list [catch {load [file join $testDir pkga$ext] {} child} msg] $msg
} {1 {can't use package in a safe interpreter: no Pkga_SafeInit procedure}}