From: Pedro Alves Date: Tue, 7 Mar 2017 12:21:00 +0000 (+0000) Subject: Rename gdb.base/tui-layout.exp -> gdb.base/tui-disasm-long-lines.exp X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=44959fa81858df7d06fd83b0595b66709e344074;p=binutils-gdb.git Rename gdb.base/tui-layout.exp -> gdb.base/tui-disasm-long-lines.exp To better reflect what the testcase is about, and to make room for a different testcase. gdb/testsuite/ChangeLog: 2017-03-07 Pedro Alves * gdb.base/tui-layout.c: Rename to ... * gdb.base/tui-disasm-long-lines.c: ... this. * gdb.base/tui-layout.exp: Rename to ... * gdb.base/tui-disasm-long-lines.exp: ... this. --- diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 30e2615cfd1..cc1a14ae3f6 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2017-03-07 Pedro Alves + + * gdb.base/tui-layout.c: Rename to ... + * gdb.base/tui-disasm-long-lines.c: ... this. + * gdb.base/tui-layout.exp: Rename to ... + * gdb.base/tui-disasm-long-lines.exp: ... this. + 2017-03-07 Pedro Alves * gdb.base/tui-layout.exp: Add intro comment and fix typo. diff --git a/gdb/testsuite/gdb.base/tui-disasm-long-lines.c b/gdb/testsuite/gdb.base/tui-disasm-long-lines.c new file mode 100644 index 00000000000..e6a5aa08112 --- /dev/null +++ b/gdb/testsuite/gdb.base/tui-disasm-long-lines.c @@ -0,0 +1,47 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2016-2017 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 . */ + +#define LONGER_NAME(x) x ## x +#define LONGER(x) LONGER_NAME(x) +#define LONGNAME1 d_this_identifier_of_32_chars_an +#define LONGNAME2 LONGER (LONGER (LONGER (LONGER (LONGER (LONGNAME1))))) + +/* Construct a long identifier name. If SHORT_IDENTIFIERS is set, limit + it to 1024 chars. */ + +#ifdef SHORT_IDENTIFIERS +#define LONGNAME3 LONGNAME2 +#else +#define LONGNAME3 LONGER (LONGER (LONGER (LONGER (LONGER (LONGNAME2))))) +#endif + +void LONGNAME3 (void); + +int +main () +{ + LONGNAME3 (); + return 0; +} + +/* Function with a long name. Placing it after main makes it more likely + to be shown in the disassembly window on startup. */ + +void +LONGNAME3 (void) +{ +} diff --git a/gdb/testsuite/gdb.base/tui-disasm-long-lines.exp b/gdb/testsuite/gdb.base/tui-disasm-long-lines.exp new file mode 100644 index 00000000000..8740ec1c103 --- /dev/null +++ b/gdb/testsuite/gdb.base/tui-disasm-long-lines.exp @@ -0,0 +1,43 @@ +# Copyright 2010-2017 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 . + +# Test that the logic for displaying the TUI disassembly window +# handles very long lines. + +standard_testfile + +set ccopts {debug quiet} +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "$binfile" \ + executable $ccopts] != "" } { + # Maybe the compiler can't handle arbitrarily long identifier names. + # Try with a shorter version. + lappend ccopts "additional_flags=-DSHORT_IDENTIFIERS" + if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "$binfile" \ + executable $ccopts] != "" } { + untested "compile" + return -1 + } +} + +clean_restart "$binfile" + +if {[skip_tui_tests]} { + # TUI support is disabled. Check for error message. + gdb_test "layout asm" "Undefined command: \"layout\". Try \"help\"." + return +} + +# Just check the command does not cause gdb to crash. +gdb_test "layout asm" diff --git a/gdb/testsuite/gdb.base/tui-layout.c b/gdb/testsuite/gdb.base/tui-layout.c deleted file mode 100644 index e6a5aa08112..00000000000 --- a/gdb/testsuite/gdb.base/tui-layout.c +++ /dev/null @@ -1,47 +0,0 @@ -/* This testcase is part of GDB, the GNU debugger. - - Copyright 2016-2017 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 . */ - -#define LONGER_NAME(x) x ## x -#define LONGER(x) LONGER_NAME(x) -#define LONGNAME1 d_this_identifier_of_32_chars_an -#define LONGNAME2 LONGER (LONGER (LONGER (LONGER (LONGER (LONGNAME1))))) - -/* Construct a long identifier name. If SHORT_IDENTIFIERS is set, limit - it to 1024 chars. */ - -#ifdef SHORT_IDENTIFIERS -#define LONGNAME3 LONGNAME2 -#else -#define LONGNAME3 LONGER (LONGER (LONGER (LONGER (LONGER (LONGNAME2))))) -#endif - -void LONGNAME3 (void); - -int -main () -{ - LONGNAME3 (); - return 0; -} - -/* Function with a long name. Placing it after main makes it more likely - to be shown in the disassembly window on startup. */ - -void -LONGNAME3 (void) -{ -} diff --git a/gdb/testsuite/gdb.base/tui-layout.exp b/gdb/testsuite/gdb.base/tui-layout.exp deleted file mode 100644 index 8740ec1c103..00000000000 --- a/gdb/testsuite/gdb.base/tui-layout.exp +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 2010-2017 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 . - -# Test that the logic for displaying the TUI disassembly window -# handles very long lines. - -standard_testfile - -set ccopts {debug quiet} -if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "$binfile" \ - executable $ccopts] != "" } { - # Maybe the compiler can't handle arbitrarily long identifier names. - # Try with a shorter version. - lappend ccopts "additional_flags=-DSHORT_IDENTIFIERS" - if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "$binfile" \ - executable $ccopts] != "" } { - untested "compile" - return -1 - } -} - -clean_restart "$binfile" - -if {[skip_tui_tests]} { - # TUI support is disabled. Check for error message. - gdb_test "layout asm" "Undefined command: \"layout\". Try \"help\"." - return -} - -# Just check the command does not cause gdb to crash. -gdb_test "layout asm"