From 640c6863281033512aefe676d9f9d12245d431bd Mon Sep 17 00:00:00 2001 From: dgp Date: Sat, 19 Jun 2004 00:42:32 +0000 Subject: * tests/load.test: Relaxed strictness of error message matching for test load-2.3 so that it will pass on Mac OSX. --- ChangeLog | 3 +++ tests/load.test | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 529168a..bcdae30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-06-18 Don Porter + * tests/load.test: Relaxed strictness of error message matching + for test load-2.3 so that it will pass on Mac OSX. + * generic/tclEncoding.c: Static TclFindEncodings -> FindEncodings. * generic/tclInt.h: Updated TclpFindExecutable() so that failed * generic/tclUtil.c: attempts to find the executable are saved diff --git a/tests/load.test b/tests/load.test index 4869d7b..62f317e 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.12 2004/03/17 18:14:18 das Exp $ +# RCS: @(#) $Id: load.test,v 1.13 2004/06/19 00:42:35 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2 @@ -72,9 +72,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}} -- cgit v0.12