[binutils-gdb/binutils-2_44-branch] run_dump_test warning/error regexp

[Alan Modra]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=973c84c5afee7a4a95630d0a87d7fd8007eadd43

commit 973c84c5afee7a4a95630d0a87d7fd8007eadd43
Author: Alan Modra <amodra@gmail.com>
Date:   Sat Jan 18 22:21:03 2025 +1030

    run_dump_test warning/error regexp
    
    This allows you to specify a run_dump_test warning that may or may not
    be present using
    warning: (warning_text_goes_here)?
    ie. the regexp matches an empty string.
    
    (cherry picked from commit 592819f7188509713f3db6dbe6bc7d0b7e3af89e)

Diff:
---
 binutils/testsuite/lib/binutils-common.exp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/binutils/testsuite/lib/binutils-common.exp b/binutils/testsuite/lib/binutils-common.exp
index 72664d84bcc..41d94d256ec 100644
--- a/binutils/testsuite/lib/binutils-common.exp
+++ b/binutils/testsuite/lib/binutils-common.exp
@@ -1567,12 +1567,16 @@ proc run_dump_test { name {extra_options {}} } {
 		verbose -log "$exitstat with: <$comp_output>, no expected output"
 	    }
 
-	    if { (($want_out(source) == "") == ($comp_output == "")) \
-		     && (($cmdret == 0) == ($want_out(terminal) == 0)) \
-		     && ((($want_out(source) == "regex") \
-			      && [regexp -- $want_out(regex) $comp_output]) \
-			     || (($want_out(source) == "file") \
-				     && (![regexp_diff "tmpdir/ld.messages" "$srcdir/$subdir/$want_out(file)"]))) } {
+	    set ok 0
+	    if { ($cmdret == 0) == ($want_out(terminal) == 0) } {
+		switch $want_out(source) {
+		    regex { set ok [regexp -- $want_out(regex) $comp_output] }
+		    file  { set ok [expr ![regexp_diff tmpdir/ld.messages \
+					   $srcdir/$subdir/$want_out(file)]] }
+		    ""    { set ok [string equal $comp_output ""] }
+		}
+	    }
+	    if { $ok } {
 		# We have the expected output.
 		if { $want_out(terminal) || $dumpprogram == "" } {
 		    pass $testname