diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-10-19 14:44:19 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-10-19 14:44:19 (GMT) |
commit | 49260f096b04c4fadf36fe575d1b43a4736e2ef2 (patch) | |
tree | 1fbffc66442e8bf4d0c23cc26d0704fd55d55ff4 | |
parent | d75194b6b8eb36f322dbaa9d6f21cadddeaa4e70 (diff) | |
parent | 58583ac83fd364a825038d5dfcdaa7c75aca836b (diff) | |
download | tcl-49260f096b04c4fadf36fe575d1b43a4736e2ef2.zip tcl-49260f096b04c4fadf36fe575d1b43a4736e2ef2.tar.gz tcl-49260f096b04c4fadf36fe575d1b43a4736e2ef2.tar.bz2 |
Merge 8.6
-rw-r--r-- | tests/cmdIL.test | 2 | ||||
-rw-r--r-- | tests/format.test | 4 | ||||
-rw-r--r-- | tests/io.test | 2 | ||||
-rw-r--r-- | tests/lset.test | 2 | ||||
-rw-r--r-- | tests/var.test | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/tests/cmdIL.test b/tests/cmdIL.test index 063750c..5a68925 100644 --- a/tests/cmdIL.test +++ b/tests/cmdIL.test @@ -776,7 +776,7 @@ test cmdIL-7.6 {lreverse command - unshared object [Bug 1672585]} { test cmdIL-7.7 {lreverse command - empty object [Bug 1876793]} { lreverse [list] } {} -test cmdIL-7.8 {lreverse command - shared intrep [Bug 1675044]} -setup { +test cmdIL-7.8 {lreverse command - shared internalrep [Bug 1675044]} -setup { teststringobj set 1 {1 2 3} testobj convert 1 list testobj duplicate 1 2 diff --git a/tests/format.test b/tests/format.test index 41918b2..a3ca81d 100644 --- a/tests/format.test +++ b/tests/format.test @@ -620,12 +620,12 @@ test format-19.4.2 {Bug d498578df4: width overflow should cause limit exceeded} } -returnCodes error -result "max size for a Tcl value exceeded" # Note that this test may fail in future versions -test format-20.1 {Bug 2932421: plain %s caused intrep change of args} -body { +test format-20.1 {Bug 2932421: plain %s caused internalrep change of args} -body { set x [dict create a b c d] format %s $x # After this, obj in $x should be a dict # We are testing to make sure it has not been shimmered to a - # different intrep when that is not necessary. + # different internalrep when that is not necessary. # Whether or not there is a string rep - we should not care! tcl::unsupported::representation $x } -match glob -result {value is a dict *} diff --git a/tests/io.test b/tests/io.test index e26c97f..0ef3422 100644 --- a/tests/io.test +++ b/tests/io.test @@ -8752,7 +8752,7 @@ test io-73.1 {channel Tcl_Obj SetChannelFromAny} {} { } {1} test io-73.2 {channel Tcl_Obj SetChannelFromAny, bug 2407783} -setup { - # Invalidate intrep of 'channel' Tcl_Obj when transiting between interpreters. + # Invalidate internalrep of 'channel' Tcl_Obj when transiting between interpreters. set f [open [info script] r] } -body { interp create foo diff --git a/tests/lset.test b/tests/lset.test index 5093369..72d68ec 100644 --- a/tests/lset.test +++ b/tests/lset.test @@ -412,7 +412,7 @@ test lset-14.2 {lset, not compiled, flat args, is string rep preserved?} testeva } "{ { 1 2 } { 3 4 } } { 3 4 }" testConstraint testobj [llength [info commands testobj]] -test lset-15.1 {lset: shared intrep [Bug 1677512]} -setup { +test lset-15.1 {lset: shared internalrep [Bug 1677512]} -setup { teststringobj set 1 {{1 2} 3} testobj convert 1 list testobj duplicate 1 2 diff --git a/tests/var.test b/tests/var.test index 3ca1a76..15edf6e 100644 --- a/tests/var.test +++ b/tests/var.test @@ -1038,7 +1038,7 @@ test var-22.0 {leak in array element unset: Bug a3309d01db} -setup { array unset A rename doit {} } -result 0 -test var-22.1 {leak in localVarName intrep: Bug 80304238ac} -setup { +test var-22.1 {leak in localVarName internalrep: Bug 80304238ac} -setup { proc doit {} { interp create child child eval { |