reverting to HEAD in preparation for changing from reworked 'mpexpr' to 'libtommath'

3 files changed, 36 insertions, 5 deletions

diff --git a/tests/compile.test b/tests/compile.test
index 5025671..b3edbdb 100644
--- a/tests/compile.test
+++ b/tests/compile.test
@@ -11,7 +11,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: compile.test,v 1.34 2004/12/02 11:10:49 dkf Exp $
+# RCS: @(#) $Id: compile.test,v 1.34.2.1 2005/01/20 14:53:40 kennykb Exp $
 
 package require tcltest 2
 namespace import -force ::tcltest::*
@@ -587,6 +587,37 @@ test compile-16.23.$noComp {
 
 }	;# End of noComp loop
 
+# These tests are messy because it wrecks the interpreter it runs in!
+# They demonstrate issues arising from [FRQ 1101710]
+test compile-17.1 {Command interpretation binding for compiled code} -constraints knownBug -setup {
+    set i [interp create]
+} -body {
+    $i eval {
+	if 1 {
+	    expr [
+		proc expr args {return substituted}
+		format {[subst compiled]}
+	    ]
+	}
+    }
+} -cleanup {
+    interp delete $i
+} -result substituted
+test compile-17.2 {Command interpretation binding for non-compiled code} -setup {
+    set i [interp create]
+} -body {
+    $i eval {
+	if 1 {
+	    [subst expr] [
+		proc expr args {return substituted}
+		format {[subst compiled]}
+	    ]
+	}
+    }
+} -cleanup {
+    interp delete $i
+} -result substituted
+
 # cleanup
 catch {rename p ""}
 catch {namespace delete test_ns_compile}
diff --git a/tests/fCmd.test b/tests/fCmd.test
index 1c234b3..c6fbaaf 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.44 2004/11/11 01:14:29 das Exp $
+# RCS: @(#) $Id: fCmd.test,v 1.44.2.1 2005/01/20 14:53:40 kennykb Exp $
 #
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
@@ -1635,7 +1635,7 @@ test fCmd-18.9 {TclFileRenameCmd: rename dir on top of a non-empty dir w/o -forc
     set result
 } {1}
 test fCmd-18.10 {TclFileRenameCmd: rename dir on top of a non-empty dir w/ -force} \
-	{notRoot} {
+	{notRoot notNetworkFilesystem} {
     catch {file delete -force -- tfa tfad}
     file mkdir tfa tfad/tfa/file
     set r1 [catch {file rename -force tfa tfad}]
diff --git a/tests/winDde.test b/tests/winDde.test
index d1b0ee1..2126d04 100644
--- a/tests/winDde.test
+++ b/tests/winDde.test
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: winDde.test,v 1.26 2004/12/01 14:02:49 dkf Exp $
+# RCS: @(#) $Id: winDde.test,v 1.26.2.1 2005/01/20 14:53:40 kennykb Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2
@@ -219,7 +219,7 @@ test winDde-5.4 {DDE eval bad arguments} -constraints {win dde} -body {
 
 test winDde-6.1 {DDE servername bad arguments} -constraints {win dde} -body {
     dde servername -z -z -z
-} -returnCodes error -result {unknown option "-z": should be -force, -handler or --}
+} -returnCodes error -result {bad option "-z": must be -force, -handler, or --}
 test winDde-6.2 {DDE servername set name} -constraints {win dde} -body {
     dde servername -- winDde-6.2
 } -result {winDde-6.2}