From 197a7bfdcac1f79ca4a15612aa98ff7db58801f4 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Sat, 12 Jun 1999 22:40:18 +0000 Subject: [PATCH] * ld-checks/asm.s: Use a symbol name for .lcomm. * ld-checks/checks.exp: Use different names for the two tests. Don't add extra text when invoking fail. --- ld/testsuite/ChangeLog | 6 ++++++ ld/testsuite/ld-checks/asm.s | 5 +---- ld/testsuite/ld-checks/checks.exp | 11 ++++++----- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 763d63b68d0..3581965be58 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,9 @@ +1999-06-13 Ian Lance Taylor + + * ld-checks/asm.s: Use a symbol name for .lcomm. + * ld-checks/checks.exp: Use different names for the two tests. + Don't add extra text when invoking fail. + 1999-06-12 Ian Lance Taylor * ld-scripts/phdrs.exp: Change target check from "*-*-linuxaout*" diff --git a/ld/testsuite/ld-checks/asm.s b/ld/testsuite/ld-checks/asm.s index e4e0c332470..ad5e177f63b 100644 --- a/ld/testsuite/ld-checks/asm.s +++ b/ld/testsuite/ld-checks/asm.s @@ -8,7 +8,4 @@ foo: bar: .long 0x87654321 - .lcomm 0x12 - - - \ No newline at end of file + .lcomm dummy, 0x12 diff --git a/ld/testsuite/ld-checks/checks.exp b/ld/testsuite/ld-checks/checks.exp index af3ef7d70a4..16fafe34095 100644 --- a/ld/testsuite/ld-checks/checks.exp +++ b/ld/testsuite/ld-checks/checks.exp @@ -24,7 +24,7 @@ proc section_check {} { global srcdir global subdir - set test "check sections" + set test "check sections 1" set ldflags "--check-sections" @@ -34,11 +34,13 @@ proc section_check {} { } if ![ld_simple_link $ld tmpdir/asm.x "$ldflags tmpdir/asm.o"] { - fail "$test : using default linker script" + fail $test } else { pass $test } + set test "check sections 2" + # Change the linker flags so that our "buggy" linker # script is used. set ldflags "--check-sections -T $srcdir/$subdir/script -e foo" @@ -51,7 +53,7 @@ proc section_check {} { # Make sure that we got some output from the linker if [string match "" $exec_output] then { - fail "$test - error message expected but not found" + fail $test } # Now remove our expected error message @@ -62,8 +64,7 @@ proc section_check {} { pass $test } else { verbose -log "Unexpected linker message(s): $exec_output" - - fail "$test - using erroneous linker script" + fail $test } } -- 2.30.2