Merge 8.6

2 files changed, 5 insertions, 5 deletions

diff --git a/tests/main.test b/tests/main.test
index ef58b6f..4aadd79 100644
--- a/tests/main.test
+++ b/tests/main.test
@@ -143,7 +143,7 @@ namespace eval ::tcl::test::main {
     test Tcl_Main-1.8 {
 	Tcl_Main: startup script - -encoding option - mismatched encodings
     } -constraints {
-	stdio deprecated
+	stdio
     } -setup {
 	set script [makeFile {} script]
 	file delete $script
@@ -153,7 +153,7 @@ namespace eval ::tcl::test::main {
 	puts -nonewline $f {puts [string equal \u20ac }
 	puts $f "€]"
 	close $f
-	catch {set f [open "|[list [interpreter] -encoding ascii script]" r]}
+	catch {set f [open "|[list [interpreter] -encoding iso8859-1 script]" r]}
     } -body {
 	read $f
     } -cleanup {
diff --git a/tests/source.test b/tests/source.test
index d67bec5..f5f9f0f 100644
--- a/tests/source.test
+++ b/tests/source.test
@@ -275,7 +275,7 @@ test source-7.5 {source -encoding: correct operation} -setup {
     removeFile source.file
     rename € {}
 } -result foo
-test source-7.6 {source -encoding: mismatch encoding error} -constraints deprecated -setup {
+test source-7.6 {source -encoding: mismatch encoding error} -setup {
     set sourcefile [makeFile {} source.file]
     file delete $sourcefile
     set f [open $sourcefile w]
@@ -283,11 +283,11 @@ test source-7.6 {source -encoding: mismatch encoding error} -constraints depreca
     puts $f "proc € {} {return foo}"
     close $f
 } -body {
-    source -encoding ascii $sourcefile
+    source -encoding iso8859-1 $sourcefile
     €
 } -cleanup {
     removeFile source.file
-} -returnCodes error -match glob -result {invalid command name*}
+} -returnCodes error -result {invalid command name "€"}
 
 test source-8.1 {source and coroutine/yield} -setup {
     set sourcefile [makeFile {} source.file]