From 8c1613603dcbe01403340fd09b055173d854ba73 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Tue, 20 Oct 2020 10:20:25 +0200 Subject: [PATCH] [gdb/testsuite] Use main.c in gdb.dwarf2 Eliminate copies of main.c in gdb.dwarf2. Tested on x86_64-linux. gdb/testsuite/ChangeLog: 2020-10-20 Tom de Vries * gdb.dwarf2/arr-stride.c: Remove. * gdb.dwarf2/arr-stride.exp: Use main.c. * gdb.dwarf2/arr-subrange.c: Remove. * gdb.dwarf2/arr-subrange.exp: Use main.c. * gdb.dwarf2/bad-regnum.c: Remove. * gdb.dwarf2/bad-regnum.exp: Use main.c. * gdb.dwarf2/corrupt.c: Remove. * gdb.dwarf2/corrupt.exp: Use main.c. * gdb.dwarf2/dw2-bad-elf.c: Remove. * gdb.dwarf2/dw2-bad-elf.exp: Use main.c. * gdb.dwarf2/dw2-icycle.c: Remove. * gdb.dwarf2/dw2-icycle.exp: Use main.c. * gdb.dwarf2/formdata16.c: Remove. * gdb.dwarf2/formdata16.exp: Use main.c. * gdb.dwarf2/implptrconst.c: Remove. * gdb.dwarf2/implptrconst.exp: Use main.c. * gdb.dwarf2/info-locals-optimized-out.c: Remove. * gdb.dwarf2/info-locals-optimized-out.exp: Use main.c. * gdb.dwarf2/opaque-type-lookup.c: Remove. * gdb.dwarf2/opaque-type-lookup.exp: Use main.c. --- gdb/testsuite/ChangeLog | 23 ++++++++++++++++++ gdb/testsuite/gdb.dwarf2/arr-stride.c | 20 ---------------- gdb/testsuite/gdb.dwarf2/arr-stride.exp | 2 +- gdb/testsuite/gdb.dwarf2/arr-subrange.c | 21 ---------------- gdb/testsuite/gdb.dwarf2/arr-subrange.exp | 2 +- gdb/testsuite/gdb.dwarf2/bad-regnum.c | 22 ----------------- gdb/testsuite/gdb.dwarf2/bad-regnum.exp | 2 +- gdb/testsuite/gdb.dwarf2/corrupt.c | 24 ------------------- gdb/testsuite/gdb.dwarf2/corrupt.exp | 2 +- gdb/testsuite/gdb.dwarf2/dw2-bad-elf.c | 21 ---------------- gdb/testsuite/gdb.dwarf2/dw2-bad-elf.exp | 2 +- gdb/testsuite/gdb.dwarf2/dw2-icycle.c | 24 ------------------- gdb/testsuite/gdb.dwarf2/dw2-icycle.exp | 2 +- gdb/testsuite/gdb.dwarf2/formdata16.c | 22 ----------------- gdb/testsuite/gdb.dwarf2/formdata16.exp | 2 +- gdb/testsuite/gdb.dwarf2/implptrconst.c | 22 ----------------- gdb/testsuite/gdb.dwarf2/implptrconst.exp | 2 +- .../gdb.dwarf2/info-locals-optimized-out.c | 23 ------------------ .../gdb.dwarf2/info-locals-optimized-out.exp | 2 +- gdb/testsuite/gdb.dwarf2/opaque-type-lookup.c | 23 ------------------ .../gdb.dwarf2/opaque-type-lookup.exp | 2 +- 21 files changed, 33 insertions(+), 232 deletions(-) delete mode 100644 gdb/testsuite/gdb.dwarf2/arr-stride.c delete mode 100644 gdb/testsuite/gdb.dwarf2/arr-subrange.c delete mode 100644 gdb/testsuite/gdb.dwarf2/bad-regnum.c delete mode 100644 gdb/testsuite/gdb.dwarf2/corrupt.c delete mode 100644 gdb/testsuite/gdb.dwarf2/dw2-bad-elf.c delete mode 100644 gdb/testsuite/gdb.dwarf2/dw2-icycle.c delete mode 100644 gdb/testsuite/gdb.dwarf2/formdata16.c delete mode 100644 gdb/testsuite/gdb.dwarf2/implptrconst.c delete mode 100644 gdb/testsuite/gdb.dwarf2/info-locals-optimized-out.c delete mode 100644 gdb/testsuite/gdb.dwarf2/opaque-type-lookup.c diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 291599589e..8ece61dc4a 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,26 @@ +2020-10-20 Tom de Vries + + * gdb.dwarf2/arr-stride.c: Remove. + * gdb.dwarf2/arr-stride.exp: Use main.c. + * gdb.dwarf2/arr-subrange.c: Remove. + * gdb.dwarf2/arr-subrange.exp: Use main.c. + * gdb.dwarf2/bad-regnum.c: Remove. + * gdb.dwarf2/bad-regnum.exp: Use main.c. + * gdb.dwarf2/corrupt.c: Remove. + * gdb.dwarf2/corrupt.exp: Use main.c. + * gdb.dwarf2/dw2-bad-elf.c: Remove. + * gdb.dwarf2/dw2-bad-elf.exp: Use main.c. + * gdb.dwarf2/dw2-icycle.c: Remove. + * gdb.dwarf2/dw2-icycle.exp: Use main.c. + * gdb.dwarf2/formdata16.c: Remove. + * gdb.dwarf2/formdata16.exp: Use main.c. + * gdb.dwarf2/implptrconst.c: Remove. + * gdb.dwarf2/implptrconst.exp: Use main.c. + * gdb.dwarf2/info-locals-optimized-out.c: Remove. + * gdb.dwarf2/info-locals-optimized-out.exp: Use main.c. + * gdb.dwarf2/opaque-type-lookup.c: Remove. + * gdb.dwarf2/opaque-type-lookup.exp: Use main.c. + 2020-10-20 Tom de Vries * gdb.dwarf2/ada-valprint-error.exp: Remove redundant mention of .exp diff --git a/gdb/testsuite/gdb.dwarf2/arr-stride.c b/gdb/testsuite/gdb.dwarf2/arr-stride.c deleted file mode 100644 index 01087518a8..0000000000 --- a/gdb/testsuite/gdb.dwarf2/arr-stride.c +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2014-2020 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 3 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, see . */ - -int -main (void) -{ - return 0; -} diff --git a/gdb/testsuite/gdb.dwarf2/arr-stride.exp b/gdb/testsuite/gdb.dwarf2/arr-stride.exp index e8bff357b0..a3d2239d6d 100644 --- a/gdb/testsuite/gdb.dwarf2/arr-stride.exp +++ b/gdb/testsuite/gdb.dwarf2/arr-stride.exp @@ -19,7 +19,7 @@ if {![dwarf2_support]} { return 0 } -standard_testfile .c -dw.S +standard_testfile main.c -dw.S # Make some DWARF for the test. set asm_file [standard_output_file $srcfile2] diff --git a/gdb/testsuite/gdb.dwarf2/arr-subrange.c b/gdb/testsuite/gdb.dwarf2/arr-subrange.c deleted file mode 100644 index 9bfe1d627f..0000000000 --- a/gdb/testsuite/gdb.dwarf2/arr-subrange.c +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2014-2020 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 3 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, see . */ - -int -main (void) -{ - asm ("main_label: .globl main_label"); - return 0; -} diff --git a/gdb/testsuite/gdb.dwarf2/arr-subrange.exp b/gdb/testsuite/gdb.dwarf2/arr-subrange.exp index 7c8250413b..495d97e0fb 100644 --- a/gdb/testsuite/gdb.dwarf2/arr-subrange.exp +++ b/gdb/testsuite/gdb.dwarf2/arr-subrange.exp @@ -19,7 +19,7 @@ if {![dwarf2_support]} { return 0 } -standard_testfile .c -dw.S +standard_testfile main.c -dw.S # Make some DWARF for the test. set asm_file [standard_output_file $srcfile2] diff --git a/gdb/testsuite/gdb.dwarf2/bad-regnum.c b/gdb/testsuite/gdb.dwarf2/bad-regnum.c deleted file mode 100644 index ebcb0c6e31..0000000000 --- a/gdb/testsuite/gdb.dwarf2/bad-regnum.c +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2015-2020 Free Software Foundation, Inc. - - This file is part of GDB. - - 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 3 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, see . */ - -int -main () -{ - return 0; -} diff --git a/gdb/testsuite/gdb.dwarf2/bad-regnum.exp b/gdb/testsuite/gdb.dwarf2/bad-regnum.exp index 5a4d91d911..acd739f7a5 100644 --- a/gdb/testsuite/gdb.dwarf2/bad-regnum.exp +++ b/gdb/testsuite/gdb.dwarf2/bad-regnum.exp @@ -20,7 +20,7 @@ if {![dwarf2_support]} { return 0 } -standard_testfile .c -dw.S +standard_testfile main.c -dw.S # Make some DWARF for the test. set asm_file [standard_output_file $srcfile2] diff --git a/gdb/testsuite/gdb.dwarf2/corrupt.c b/gdb/testsuite/gdb.dwarf2/corrupt.c deleted file mode 100644 index e99760d7a9..0000000000 --- a/gdb/testsuite/gdb.dwarf2/corrupt.c +++ /dev/null @@ -1,24 +0,0 @@ -/* This testcase is part of GDB, the GNU debugger. - - Copyright 2014-2020 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 3 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, see . */ - -/* Dummy main function. */ - -int -main (void) -{ - return 0; -} diff --git a/gdb/testsuite/gdb.dwarf2/corrupt.exp b/gdb/testsuite/gdb.dwarf2/corrupt.exp index d89beb596e..f78c865fad 100644 --- a/gdb/testsuite/gdb.dwarf2/corrupt.exp +++ b/gdb/testsuite/gdb.dwarf2/corrupt.exp @@ -22,7 +22,7 @@ if {![dwarf2_support]} { return 0 } -standard_testfile .c .S +standard_testfile main.c .S # Make the DWARF used for the test. # diff --git a/gdb/testsuite/gdb.dwarf2/dw2-bad-elf.c b/gdb/testsuite/gdb.dwarf2/dw2-bad-elf.c deleted file mode 100644 index 8e6193ee59..0000000000 --- a/gdb/testsuite/gdb.dwarf2/dw2-bad-elf.c +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2019-2020 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 3 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, see . */ - -int -main () -{ - asm ("main_label: .globl main_label"); - return 0; -} diff --git a/gdb/testsuite/gdb.dwarf2/dw2-bad-elf.exp b/gdb/testsuite/gdb.dwarf2/dw2-bad-elf.exp index c06a605e5d..a85d3430a7 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-bad-elf.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-bad-elf.exp @@ -34,7 +34,7 @@ if {![dwarf2_support]} { return 0 } -standard_testfile .c -other.S -dwarf.S +standard_testfile main.c -other.S -dwarf.S # Make some DWARF for the test. set asm_file [standard_output_file $srcfile3] diff --git a/gdb/testsuite/gdb.dwarf2/dw2-icycle.c b/gdb/testsuite/gdb.dwarf2/dw2-icycle.c deleted file mode 100644 index 7d8ecfe10d..0000000000 --- a/gdb/testsuite/gdb.dwarf2/dw2-icycle.c +++ /dev/null @@ -1,24 +0,0 @@ -/* This testcase is part of GDB, the GNU debugger. - - Copyright 2004-2020 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 3 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, see . */ - -/* Dummy main function. */ - -int -main() -{ - return 0; -} diff --git a/gdb/testsuite/gdb.dwarf2/dw2-icycle.exp b/gdb/testsuite/gdb.dwarf2/dw2-icycle.exp index 4e8f01b252..9a01808528 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-icycle.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-icycle.exp @@ -22,7 +22,7 @@ if {![dwarf2_support]} { return 0 } -standard_testfile .S .c +standard_testfile .S main.c if { [prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $srcfile2] {nodebug}] } { diff --git a/gdb/testsuite/gdb.dwarf2/formdata16.c b/gdb/testsuite/gdb.dwarf2/formdata16.c deleted file mode 100644 index dc9d154113..0000000000 --- a/gdb/testsuite/gdb.dwarf2/formdata16.c +++ /dev/null @@ -1,22 +0,0 @@ -/* This testcase is part of GDB, the GNU debugger. - - Copyright 2017-2020 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 3 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, see . */ - -int -main () -{ - return 0; -} diff --git a/gdb/testsuite/gdb.dwarf2/formdata16.exp b/gdb/testsuite/gdb.dwarf2/formdata16.exp index 0a664a9b13..dc908a10f5 100644 --- a/gdb/testsuite/gdb.dwarf2/formdata16.exp +++ b/gdb/testsuite/gdb.dwarf2/formdata16.exp @@ -20,7 +20,7 @@ if {![dwarf2_support]} { return 0 } -standard_testfile .c -dw.S +standard_testfile main.c -dw.S # We need to know the endianess in order # to write some of the debugging info we'd like to generate. diff --git a/gdb/testsuite/gdb.dwarf2/implptrconst.c b/gdb/testsuite/gdb.dwarf2/implptrconst.c deleted file mode 100644 index be3f852a79..0000000000 --- a/gdb/testsuite/gdb.dwarf2/implptrconst.c +++ /dev/null @@ -1,22 +0,0 @@ -/* This testcase is part of GDB, the GNU debugger. - - Copyright 2013-2020 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 3 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, see . */ - -int -main () -{ - return 0; -} diff --git a/gdb/testsuite/gdb.dwarf2/implptrconst.exp b/gdb/testsuite/gdb.dwarf2/implptrconst.exp index 7de2df452a..2cd8bf8909 100644 --- a/gdb/testsuite/gdb.dwarf2/implptrconst.exp +++ b/gdb/testsuite/gdb.dwarf2/implptrconst.exp @@ -22,7 +22,7 @@ if {![dwarf2_support]} { if { [skip_cplus_tests] } { continue } -standard_testfile .c -dw.S +standard_testfile main.c -dw.S # Make some DWARF for the test. set asm_file [standard_output_file $srcfile2] diff --git a/gdb/testsuite/gdb.dwarf2/info-locals-optimized-out.c b/gdb/testsuite/gdb.dwarf2/info-locals-optimized-out.c deleted file mode 100644 index dc4137f9d6..0000000000 --- a/gdb/testsuite/gdb.dwarf2/info-locals-optimized-out.c +++ /dev/null @@ -1,23 +0,0 @@ -/* This testcase is part of GDB, the GNU debugger. - - Copyright 2017-2020 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 3 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, see . */ - -int -main (void) -{ - asm ("main_label: .globl main_label"); - return 0; -} diff --git a/gdb/testsuite/gdb.dwarf2/info-locals-optimized-out.exp b/gdb/testsuite/gdb.dwarf2/info-locals-optimized-out.exp index 33ce4a0054..210acc1864 100644 --- a/gdb/testsuite/gdb.dwarf2/info-locals-optimized-out.exp +++ b/gdb/testsuite/gdb.dwarf2/info-locals-optimized-out.exp @@ -22,7 +22,7 @@ if {![dwarf2_support]} { return 0 } -standard_testfile .c -dw.S +standard_testfile main.c -dw.S # Make some DWARF for the test. diff --git a/gdb/testsuite/gdb.dwarf2/opaque-type-lookup.c b/gdb/testsuite/gdb.dwarf2/opaque-type-lookup.c deleted file mode 100644 index 3bd3f1fc1e..0000000000 --- a/gdb/testsuite/gdb.dwarf2/opaque-type-lookup.c +++ /dev/null @@ -1,23 +0,0 @@ -/* This testcase is part of GDB, the GNU debugger. - - Copyright 2015-2020 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 3 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, see . */ - -int -main() -{ - asm ("main_label: .globl main_label"); - return 0; -} diff --git a/gdb/testsuite/gdb.dwarf2/opaque-type-lookup.exp b/gdb/testsuite/gdb.dwarf2/opaque-type-lookup.exp index 118db2270d..675992fc05 100644 --- a/gdb/testsuite/gdb.dwarf2/opaque-type-lookup.exp +++ b/gdb/testsuite/gdb.dwarf2/opaque-type-lookup.exp @@ -22,7 +22,7 @@ if {![dwarf2_support]} { return 0 } -standard_testfile .c -1.S -2.c +standard_testfile main.c -1.S -2.c # Create the DWARF. set asm_file [standard_output_file $srcfile2] -- 2.34.1