Allow multiple tests to be run on systems with older versions of TCL installed.

	PR 24287
	* testsuite/lib/binutils-common.exp (run_dump_test): Replace a use
	of "lmap" with a "foreach" loop.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index aa33e52..6a546fa 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2019-03-05  Matthew Malcomson  <matthew.malcomson@arm.com>
+
+       PR 24287
+       * testsuite/lib/binutils-common.exp (run_dump_test): Replace a use
+       of "lmap" with a "foreach" loop.
+
 2019-03-04  Nick Clifton  <nickc@redhat.com>
 
        PR 24281

diff --git a/binutils/testsuite/lib/binutils-common.exp b/binutils/testsuite/lib/binutils-common.exp
index e01b3fb..8f622ba 100644 (file)
--- a/binutils/testsuite/lib/binutils-common.exp
+++ b/binutils/testsuite/lib/binutils-common.exp
@@ -829,19 +829,19 @@ proc run_dump_test { name {extra_options {}} } {
        }
     }
 
-    # Ensure there is something in $opts(as) for the lmap below.
+    # Ensure there is something in $opts(as) for the foreach loop below.
     if { [llength $opts(as)] == 0 } {
         set opts(as) [list " "]
     }
-    set as_final_flags [lmap x $opts(as) {
+    foreach x $opts(as) {
         if { [string length $x] && [string length $as_additional_flags] } {
             append x " "
         }
         append x $as_additional_flags
         regsub {\[big_or_little_endian\]} $x \
             [big_or_little_endian] x
-        expr {$x}
-    }]
+        lappend as_final_flags $x
+    }
 
     regsub {\[big_or_little_endian\]} $opts(ld) \
         [big_or_little_endian] opts(ld)