From d284f9118b547ed5cbe61bbe0ee9b683198104c8 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 25 Aug 2025 11:42:28 +0000
Subject: Remove some more references to non-existing Tcl version 8.7

---
 library/tcltest/tcltest.tcl |  4 ++--
 tests/safe-stock.test       |  4 ++--
 tests/string.test           | 20 ++++++--------------
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl
index a2a4ae8..ab3b354 100644
--- a/library/tcltest/tcltest.tcl
+++ b/library/tcltest/tcltest.tcl
@@ -30,7 +30,7 @@ namespace eval tcltest {
     variable patchLevel [info patchlevel]
 
     # Detect if we can use code points >= \U10000
-    variable fullutf [package vsatisfies $version 8.7-]
+    variable fullutf [package vsatisfies $version 9.0-]
 
 ##### Export the public tcltest procs; several categories
     #
@@ -3330,7 +3330,7 @@ proc tcltest::viewFile {name {directory ""}} {
 # construct improperly formed strings in this manner, because it involves
 # exposing that Tcl uses UTF-8 internally.
 #
-# This function doesn't work any more in Tcl 8.7, since the 'identity'
+# This function doesn't work any more in Tcl 9.0, since the 'identity'
 # is gone (TIP #345)
 #
 # Arguments:
diff --git a/tests/safe-stock.test b/tests/safe-stock.test
index 0bab25d..3ab175d 100644
--- a/tests/safe-stock.test
+++ b/tests/safe-stock.test
@@ -3,7 +3,7 @@
 # This file contains tests for safe Tcl that were previously in the file
 # safe.test, and use files and packages of stock Tcl 8.6 to perform the tests.
 # These files may be changed or disappear in future revisions of Tcl,
-# for example package http 1.0 will be removed from Tcl 8.7.
+# for example package http 1.0 will be removed from Tcl 9.0.
 #
 # The tests are replaced in safe.tcl with tests that use files provided in the
 # tests directory.  Test numbering is for comparison with similar tests in
@@ -13,7 +13,7 @@
 # No output means no errors were found.
 #
 # Copyright (c) 1995-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
+# Copyright (c) 1998-1999 Scriptics Corporation.
 #
 # See the file "license.terms" for information on usage and redistribution of
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
diff --git a/tests/string.test b/tests/string.test
index 7a44f98..dff10e9 100644
--- a/tests/string.test
+++ b/tests/string.test
@@ -22,9 +22,9 @@ catch [list package require -exact Tcltest [info patchlevel]]
 
 # Some tests require the testobj command
 
-testConstraint testobj [expr {[info commands testobj] != {}}]
-testConstraint testindexobj [expr {[info commands testindexobj] != {}}]
-testConstraint testevalex [expr {[info commands testevalex] != {}}]
+testConstraint testobj [expr {[info commands testobj] ne {}}]
+testConstraint testindexobj [expr {[info commands testindexobj] ne {}}]
+testConstraint testevalex [expr {[info commands testevalex] ne {}}]
 testConstraint utf16 [expr {[string length \U010000] == 2}]
 testConstraint testbytestring   [llength [info commands testbytestring]]
 
@@ -172,11 +172,7 @@ test string-2.36.$noComp {string compare, binary neq unequal length} {
     run {string compare [binary format a20a 0 1] [binary format a100a 0 0]}
 } 1
 test string-2.37.$noComp {string compare, big -length} {
-    if {[package vsatisfies [info patchlevel] 8.7-]} {
-      run {string compare -length 0x100000000 ab abde}
-    } else {
-      run {string compare -length 0x7fffffff ab abde}
-    }
+    run {string compare -length 0x7fffffff ab abde}
 } -1
 test string-2.38a.$noComp {string compare empty string against byte array} {
     # Bug edb4b065f4
@@ -343,11 +339,7 @@ test string-3.42.$noComp {string equal, binary neq inequal length} {
     run {string equal [binary format a20a 0 1] [binary format a100a 0 0]}
 } 0
 test string-3.43.$noComp {string equal, big -length} {
-    if {[package vsatisfies [info patchlevel] 8.7-]} {
-      run {string equal -length 0x100000000 abc def}
-    } else {
-      run {string equal -length 0x7fffffff abc def}
-    }
+    run {string equal -length 0x7fffffff abc def}
 } 0
 test string-3.44.$noComp {string equal, bigger -length} -body {
     run {string equal -length 18446744073709551616 abc def}
@@ -456,7 +448,7 @@ test string-5.3.$noComp {string index} {
     run {string index abcde 0}
 } a
 test string-5.4.$noComp {string index} {
-    run {string in abcde 4}
+    run {string ind abcde 4}
 } e
 test string-5.5.$noComp {string index} {
     run {string index abcde 5}
-- 
cgit v0.12