diff options
| author | Andrew Burgess <andrew.burgess@embecosm.com> | 2016-03-30 14:34:34 +0100 |
|---|---|---|
| committer | Andrew Burgess <andrew.burgess@embecosm.com> | 2016-03-30 17:58:05 +0100 |
| commit | 62bdf2d66e4816219279cff7440ae1a167d7aca2 (patch) | |
| tree | 41cfde116c17b1bb91200013df844fe0b62337f6 /ld | |
| parent | fb3f3d25c3cbf561d33b258ff11fd8139f6ad75d (diff) | |
| download | gdb-62bdf2d66e4816219279cff7440ae1a167d7aca2.zip gdb-62bdf2d66e4816219279cff7440ae1a167d7aca2.tar.gz gdb-62bdf2d66e4816219279cff7440ae1a167d7aca2.tar.bz2 | |
ld/testing: Fix error and warning checks in run_dump_test
The options warning_output and error_output to the run_dump_test
function were incorrectly checking the return value from the regexp_diff
function, and so, as a result failing tests were showing as a pass.
Fixed in this commit.
ld/ChangeLog:
* testsuite/lib/ld-lib.exp (run_dump_test): Fix check of return
value from regexp_diff.
* testsuite/ld-elf/orphan-5.l: Fix expected output.
* testsuite/ld-elf/orphan-6.l: Likewise.
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 7 | ||||
| -rw-r--r-- | ld/testsuite/ld-elf/orphan-5.l | 4 | ||||
| -rw-r--r-- | ld/testsuite/ld-elf/orphan-6.l | 4 | ||||
| -rw-r--r-- | ld/testsuite/lib/ld-lib.exp | 2 |
4 files changed, 12 insertions, 5 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 17c0f6f..711817c 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,10 @@ +2016-03-30 Andrew Burgess <andrew.burgess@embecosm.com> + + * testsuite/lib/ld-lib.exp (run_dump_test): Fix check of return + value from regexp_diff. + * testsuite/ld-elf/orphan-5.l: Fix expected output. + * testsuite/ld-elf/orphan-6.l: Likewise. + 2016-03-30 Alan Modra <amodra@gmail.com> PR 18452 diff --git a/ld/testsuite/ld-elf/orphan-5.l b/ld/testsuite/ld-elf/orphan-5.l index 20a9fe7..765c8ff 100644 --- a/ld/testsuite/ld-elf/orphan-5.l +++ b/ld/testsuite/ld-elf/orphan-5.l @@ -1,5 +1,5 @@ #... -.*warning: orphan section `\.notbad' from `tmpdir/orphan\.o' being placed in section `\.notbad'\. +.*warning: orphan section `\.notbad' from `tmpdir/.*\.o' being placed in section `\.notbad'\. #... -.*warning: orphan section `\.note\.bar' from `tmpdir/orphan\.o' being placed in section `\.note\.bar'\. +.*warning: orphan section `\.note\.bar' from `tmpdir/.*\.o' being placed in section `\.note\.bar'\. #... diff --git a/ld/testsuite/ld-elf/orphan-6.l b/ld/testsuite/ld-elf/orphan-6.l index 5ac7895..9936140 100644 --- a/ld/testsuite/ld-elf/orphan-6.l +++ b/ld/testsuite/ld-elf/orphan-6.l @@ -1,5 +1,5 @@ #... -.*error: unplaced orphan section `\.notbad' from `tmpdir/orphan\.o'\. +.*error: unplaced orphan section `\.notbad' from `tmpdir/.*\.o'\. #... -.*error: unplaced orphan section `\.note\.bar' from `tmpdir/orphan\.o'\. +.*error: unplaced orphan section `\.note\.bar' from `tmpdir/.*\.o'\. #... diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp index f4283a5..320ed82 100644 --- a/ld/testsuite/lib/ld-lib.exp +++ b/ld/testsuite/lib/ld-lib.exp @@ -975,7 +975,7 @@ proc run_dump_test { name {extra_options {}} } { && ($check_ld(regex) == "") == ($comp_output == "") \ && [regexp $check_ld(regex) $comp_output]) \ || (($check_ld(source) == "file") \ - && ([regexp_diff "tmpdir/ld.messages" "$srcdir/$subdir/$check_ld(file)"]))) } { + && (![regexp_diff "tmpdir/ld.messages" "$srcdir/$subdir/$check_ld(file)"]))) } { # We have the expected output from ld. if { $check_ld(terminal) || $program == "" } { pass $testname |