From: Jørgen Kvalsvik <j@lambda.is>
Date: Sun, 14 Jul 2024 19:39:44 +0000 (+0200)
Subject: Use foreach, not lmap, for tcl <= 8.5 compat
X-Git-Tag: basepoints/gcc-16~7441
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec64666f97be24595ae0bc9055c19dabbe68a14c;p=thirdparty%2Fgcc.git

Use foreach, not lmap, for tcl <= 8.5 compat

lmap was introduced in tcl 8.6, and while it was released in 2012, lmap
does not really make too much of a difference to warrant the friction on
consverative (and relevant) systems.

gcc/testsuite/ChangeLog:

	* lib/gcov.exp: Use foreach, not lmap, for tcl <= 8.5 compat.
---

diff --git a/gcc/testsuite/lib/gcov.exp b/gcc/testsuite/lib/gcov.exp
index e49f1011884..91d9e85f8cf 100644
--- a/gcc/testsuite/lib/gcov.exp
+++ b/gcc/testsuite/lib/gcov.exp
@@ -512,25 +512,29 @@ proc verify-filters { testname testcase file expected unexpected } {
 
     set seen [lsort -unique $seen]
 
-    set expected [lmap key $expected {
-	if { $key in $seen } continue
-	set key
-    }]
-    set unexpected [lmap key $unexpected {
-	if { $key ni $seen } continue
-	set key
-    }]
-
-    foreach sym $expected {
+    set ex {}
+    foreach key $expected {
+	if { $key ni $seen } {
+	    lappend ex $key
+	}
+    }
+    set unex {}
+    foreach key $unexpected {
+	if { $key in $seen } {
+	    lappend unex $key
+	}
+    }
+
+    foreach sym $ex {
 	fail "Did not see expected symbol '$sym'"
     }
 
-    foreach sym $unexpected {
+    foreach sym $unex {
 	fail "Found unexpected symbol '$sym'"
     }
 
     close $fd
-    return [expr [llength $expected] + [llength $unexpected]]
+    return [expr [llength $ex] + [llength $unex]]
 }
 
 proc gcov-pytest-format-line { args } {