From 6e2194f0772c505e0ee872611664188c8513a0b1 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Wed, 2 Mar 1994 02:59:43 +0000 Subject: [PATCH] Change "error" to "perror" everywhere. --- gas/testsuite/gas/hppa/more.parse/parse.exp | 6 +- gas/testsuite/gas/hppa/parse/parse.exp | 6 +- gas/testsuite/gas/hppa/unsorted/unsorted.exp | 156 +++++++++++++++++++ 3 files changed, 162 insertions(+), 6 deletions(-) create mode 100755 gas/testsuite/gas/hppa/unsorted/unsorted.exp diff --git a/gas/testsuite/gas/hppa/more.parse/parse.exp b/gas/testsuite/gas/hppa/more.parse/parse.exp index fcd8f50c859..268ec69c260 100755 --- a/gas/testsuite/gas/hppa/more.parse/parse.exp +++ b/gas/testsuite/gas/hppa/more.parse/parse.exp @@ -38,7 +38,7 @@ proc do_string_tests {} { -re "^ +\[0-9\]+ 0014 09307831\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 3233\[^\n\]*\n" { set x [expr $x+1] } -re "\[^\n\]*\n" { } - timeout { error "timeout\n"; break } + timeout { perror "timeout\n"; break } eof { break } } } @@ -65,7 +65,7 @@ proc do_lsel_test {} { -re "^ +\[0-9\]+ 0008 22A04000\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 000c 36B50100\[^\n\]*\n" { set x [expr $x+1] } -re "\[^\n\]*\n" { } - timeout { error "timeout\n"; break } + timeout { perror "timeout\n"; break } eof { break } } } @@ -105,7 +105,7 @@ proc do_valid_align_tests {} { -re "^ +\[0-9\]+ 0828\[^\n\]*BLOCK\[^\n\]*4\[^\n\]*\n" { set x [expr $x+1] } -re "\[^\n\]*\n" { } - timeout { error "timeout\n"; break } + timeout { perror "timeout\n"; break } eof { break } } } diff --git a/gas/testsuite/gas/hppa/parse/parse.exp b/gas/testsuite/gas/hppa/parse/parse.exp index fcd8f50c859..268ec69c260 100755 --- a/gas/testsuite/gas/hppa/parse/parse.exp +++ b/gas/testsuite/gas/hppa/parse/parse.exp @@ -38,7 +38,7 @@ proc do_string_tests {} { -re "^ +\[0-9\]+ 0014 09307831\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 3233\[^\n\]*\n" { set x [expr $x+1] } -re "\[^\n\]*\n" { } - timeout { error "timeout\n"; break } + timeout { perror "timeout\n"; break } eof { break } } } @@ -65,7 +65,7 @@ proc do_lsel_test {} { -re "^ +\[0-9\]+ 0008 22A04000\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 000c 36B50100\[^\n\]*\n" { set x [expr $x+1] } -re "\[^\n\]*\n" { } - timeout { error "timeout\n"; break } + timeout { perror "timeout\n"; break } eof { break } } } @@ -105,7 +105,7 @@ proc do_valid_align_tests {} { -re "^ +\[0-9\]+ 0828\[^\n\]*BLOCK\[^\n\]*4\[^\n\]*\n" { set x [expr $x+1] } -re "\[^\n\]*\n" { } - timeout { error "timeout\n"; break } + timeout { perror "timeout\n"; break } eof { break } } } diff --git a/gas/testsuite/gas/hppa/unsorted/unsorted.exp b/gas/testsuite/gas/hppa/unsorted/unsorted.exp new file mode 100755 index 00000000000..f63c34a4687 --- /dev/null +++ b/gas/testsuite/gas/hppa/unsorted/unsorted.exp @@ -0,0 +1,156 @@ +# Copyright (C) 1993 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +# Please email any bugs, comments, and/or additions to this file to: +# DejaGnu@cygnus.com + +# Written by the Center for Software Science at the University of Utah +# and by Cygnus Support. + +proc do_subspace_align_test {} { + set testname "ss_align.s: Test subspace alignment (part 2)" + set x 0 + + if [gas_test_old "ss_align.s" "" "subspace alignment (part 1)"] then { + objdump_start_no_subdir "a.out" "-h" + + # Check the headers for the correct alignment value for the + # .data section (elf) or the $DATA$ subspace (som). + if [istarget hppa*-*-*elf*] then { + while 1 { + expect { + -re "data\[^\n\]*align 2..6\[^\n\]*\n" { set x 1 } + -re "\[^\n\]*\n" { } + timeout { perror "timeout\n"; break } + eof { break } + } + } + } else { + while 1 { + expect { + -re "DATA\[^\n\]*align 2..6\[^\n\]*\n" { set x 1 } + -re "\[^\n\]*\n" { } + timeout { perror "timeout\n"; break } + eof { break } + } + } + } + + # This was intended to do any cleanup necessary. It kinda looks like it + # isn't needed, but just in case, please keep it in for now. + objdump_finish + + # Did we find what we were looking for? If not, flunk it. + if [expr $x==1] then { pass $testname } else { fail $testname } + } +} + +proc do_local_label_test {} { + set testname "locallabel.s: Elimination of local labels (part 2)" + set x 0 + + if [gas_test_old "locallabel.s" "" "Elimination of local labels (part1)"] { + objdump_start_no_subdir "a.out" "-t" + + while 1 { + expect { + -re "^00000000\[^\n\]*Label\[^\n\]*\n" { set x 1 } + -re "^00000000\[^\n\]*L\$01234\[^\n\]*\n" { set x 0 } + -re "\[^\n\]*\n" { } + timeout { perror "timeout\n"; break } + eof { break } + } + } + + # This was intended to do any cleanup necessary. It kinda looks like it + # isn't needed, but just in case, please keep it in for now. + objdump_finish + + # Did we find what we were looking for? If not, flunk it. + if [expr $x==1] then { pass $testname } else { fail $testname } + } +} + +proc do_frchain_test {} { + set testname "fragbug.s: Test bug in frag chaining (part 2)" + set x 0 + + if [gas_test_old "fragbug.s" "" "Test bug in frag chaining (part1)"] { + objdump_start_no_subdir "a.out" "-d" + + while 1 { + expect { + -re "^00000000\[^\n\]*nop\[^\n\]*\n" { set x 1 } + -re "^00000004\[^\n\]*nop\[^\n\]*\n" { set x 0 } + -re "\[^\n\]*\n" { } + timeout { perror "timeout\n"; break } + eof { break } + } + } + + # This was intended to do any cleanup necessary. It kinda looks like it + # isn't needed, but just in case, please keep it in for now. + objdump_finish + + # Did we find what we were looking for? If not, flunk it. + if [expr $x==1] then { pass $testname } else { fail $testname } + } +} + +proc do_align3_test {} { + set testname "align3.s: Test for alignment bug when switching subspaces (part2)" + set x 0 + + if [gas_test_old "align3.s" "" "Test for alignment bug when switching subspaces (part1)"] { + objdump_start_no_subdir "a.out" "-d" + + while 1 { + expect { + -re "\[^\n\]*
nop\[^\n\]*\n" { set x 1 } + -re "\[^\n\]* nop\[^\n\]*\n" { set x 0 } + -re "\[^\n\]*\n" { } + timeout { perror "timeout\n"; break } + eof { break } + } + } + + # This was intended to do any cleanup necessary. It kinda looks like it + # isn't needed, but just in case, please keep it in for now. + objdump_finish + + # Did we find what we were looking for? If not, flunk it. + if [expr $x==1] then { pass $testname } else { fail $testname } + } +} + +if [istarget hppa*-*-*] then { + # Make sure subspace alignment requests from the subspace directives + # are honored + do_subspace_align_test + + # Make sure the correct labels end up in the symbol table + do_local_label_test + + # GAS-1.36 choked on this file. + gas_test "labeldiffs.s" "" "" "Difference of labels" + + # Test a recent bug where frag chaining wasn't working correctly. + do_frchain_test + + # Test bug where switching between subspaces creates bogus alignments +; do_align3_test +} + -- 2.30.2