diff mbox

[13/16] Drop non-prototype C function header variants: 'list' test case

Message ID 1414598446-13831-13-git-send-email-arnez@linux.vnet.ibm.com
State New
Headers show

Commit Message

Andreas Arnez Oct. 29, 2014, 4 p.m. UTC 
Remove old-style function header variants from list0.h and list1.c.
Fill the removed lines with comments or empty lines, such that the
line numbering is undisturbed.

gdb/testsuite/ChangeLog:

	* gdb.base/list0.h: Remove #ifdef PROTOTYPES, keep prototyped
	variant.  Preserve original line numbering.
	* gdb.base/list1.c: Likewise.
---
 gdb/testsuite/gdb.base/list0.h |  8 ++++----
 gdb/testsuite/gdb.base/list1.c | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

 int oof (int n)
-#else
-oof (n) int n;
-#endif
+/* o
+   o
+   o */
 {
   return n + 1;
 }

Comments

Pedro Alves Nov. 12, 2014, 12:33 p.m. UTC | #1 
On 10/29/2014 04:00 PM, Andreas Arnez wrote:
> Remove old-style function header variants from list0.h and list1.c.
> Fill the removed lines with comments or empty lines, such that the
> line numbering is undisturbed.

Why is it important that the line numbering is undisturbed?

Thanks,
Pedro Alves
Andreas Arnez Nov. 12, 2014, 3:05 p.m. UTC | #2 
On Wed, Nov 12 2014, Pedro Alves wrote:

> On 10/29/2014 04:00 PM, Andreas Arnez wrote:
>> Remove old-style function header variants from list0.h and list1.c.
>> Fill the removed lines with comments or empty lines, such that the
>> line numbering is undisturbed.
>
> Why is it important that the line numbering is undisturbed?

Changes to the line numbering would require heavy adjustments to
list.exp.  Many line numbers are hard-coded, as well as a fair amount of
knowledge about the source code in and around certain lines.  Thus the
dependency on the line numbering can not be eliminated so easily here,
and it may not even be a useful goal for a "list" test case.  Another
option might be to adjust the literal line numbers in list.exp, but even
that is not as straightforward as it may seem, since the test case
expects certain source lines to be exactly n lines apart.

I'll add the above explanation to the commit message, OK?
Pedro Alves Nov. 12, 2014, 3:18 p.m. UTC | #3 
On 11/12/2014 03:05 PM, Andreas Arnez wrote:
> On Wed, Nov 12 2014, Pedro Alves wrote:
> 
>> On 10/29/2014 04:00 PM, Andreas Arnez wrote:
>>> Remove old-style function header variants from list0.h and list1.c.
>>> Fill the removed lines with comments or empty lines, such that the
>>> line numbering is undisturbed.
>>
>> Why is it important that the line numbering is undisturbed?
> 
> Changes to the line numbering would require heavy adjustments to
> list.exp.  Many line numbers are hard-coded, as well as a fair amount of
> knowledge about the source code in and around certain lines.  Thus the
> dependency on the line numbering can not be eliminated so easily here,
> and it may not even be a useful goal for a "list" test case.  Another
> option might be to adjust the literal line numbers in list.exp, but even
> that is not as straightforward as it may seem, since the test case
> expects certain source lines to be exactly n lines apart.
> 
> I'll add the above explanation to the commit message, OK?

OK.

Thanks,
Pedro Alves
diff mbox

Patch

diff --git a/gdb/testsuite/gdb.base/list0.h b/gdb/testsuite/gdb.base/list0.h
index d468330..42a4fe0 100644
--- a/gdb/testsuite/gdb.base/list0.h
+++ b/gdb/testsuite/gdb.base/list0.h
@@ -1,10 +1,10 @@ 
 /* An include file that actually causes code to be generated in the including file.  This is known to cause problems on some systems. */
-#ifdef PROTOTYPES
+
 extern void bar(int);
 static void foo (int x)
-#else
-static void foo (x) int x;
-#endif
+/* !
+   !
+   ! */
 {
     bar (x++);
     bar (x++);
diff --git a/gdb/testsuite/gdb.base/list1.c b/gdb/testsuite/gdb.base/list1.c
index 6094104..a9f614f 100644
--- a/gdb/testsuite/gdb.base/list1.c
+++ b/gdb/testsuite/gdb.base/list1.c
@@ -1,11 +1,11 @@ 
 #include <stdio.h>
 
-#ifdef PROTOTYPES
+
 void long_line (); int oof (int);
 void bar (int x)
-#else
-void bar (x) int x;
-#endif
+/* -
+   -
+   - */
 {
     printf ("%d\n", x);
 
@@ -18,9 +18,9 @@  unused ()
     /* Not used for anything */
 }
 /* This routine has a very long line that will break searching in older versions of GDB.  */
-#ifdef PROTOTYPES
+
 void
-#endif
+
 long_line ()
 {
   oof (67);
@@ -29,11 +29,11 @@  long_line ()
 
   oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*  5 */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /* 10 */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (!
 12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /* 15 */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /* 20 */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /* 25 */     !
  oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /* 30 */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /* 35 */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (1!
 2);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);!
   oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /* 40 */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /* 45 */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /* 50 */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    !
 */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /* 55 */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /* 60 */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12); !
  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oo!
 f (12);  oof (12);  oof (12);  oof (12); /* 65 */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (12); /*    */      oof (12);  oof (12);  oof (12);  oof (12);  oof (12);  oof (1234); /* 70 */
 }
-#ifdef PROTOTYPES
+