From 58a42a843bb2973b3668c0383c95f2493f35da03 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 25 Jul 2025 12:18:14 -0600 Subject: Rewrite tcl_version_at_least tcl_version_at_least can more easily be expressed using the built-in "package" command. Approved-By: Simon Marchi --- gdb/testsuite/lib/gdb.exp | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'gdb') diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 58cdd7d..b5092c6 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -1680,21 +1680,9 @@ proc python_version_at_least { major minor } { # Return 1 if tcl version used is at least MAJOR.MINOR.PATCHLEVEL. proc tcl_version_at_least { major minor {patchlevel 0} } { - global tcl_patchLevel - regexp {^([0-9]+)\.([0-9]+)\.([0-9]+)$} \ - $tcl_patchLevel dummy \ - tcl_version_major tcl_version_minor tcl_version_patchlevel - return \ - [version_compare \ - [list \ - $major \ - $minor \ - $patchlevel] \ - <= \ - [list \ - $tcl_version_major \ - $tcl_version_minor \ - $tcl_version_patchlevel]] + set current_version [package require Tcl] + set min_version "$major.$minor.$patchlevel" + return [expr {[package vcompare $current_version $min_version] >= 0}] } if { [tcl_version_at_least 8 6] == 0 } { -- cgit v1.1