Patchwork [pushed] Unbreak spurious fails in gdb.base/step-line.exp

login
register
mail settings
Submitter Joel Brobecker
Date Jan. 3, 2018, 3:59 a.m.
Message ID <20180103035916.3526-1-brobecker@adacore.com>
Download mbox | patch
Permalink /patch/25189/
State New
Headers show

Comments

Joel Brobecker - Jan. 3, 2018, 3:59 a.m.
Hello,

My copyright year update in the copyright headers of the step-line
testcase caused it to start failing, due to shift in line numbers.

    FAIL: gdb.base/step-line.exp: continue to f1
    FAIL: gdb.base/step-line.exp: next to dummy 2
    FAIL: gdb.base/step-line.exp: next over dummy 2
    FAIL: gdb.base/step-line.exp: step into f2
    FAIL: gdb.base/step-line.exp: next over dummy 4
    FAIL: gdb.base/step-line.exp: next to dummy 5
    FAIL: gdb.base/step-line.exp: next to dummy 6
    FAIL: gdb.base/step-line.exp: next over dummy 6
    FAIL: gdb.base/step-line.exp: next to dummy 7
    FAIL: gdb.base/step-line.exp: next to dummy 8
    FAIL: gdb.base/step-line.exp: next over dummy 8
    FAIL: gdb.base/step-line.exp: next to dummy 9
    FAIL: gdb.base/step-line.exp: next to dummy 10
    FAIL: gdb.base/step-line.exp: next over dummy 10

This was caused by the copyright.py script after I changed it to
also update this testcase, which made the following transformation:

    -   Copyright (C) 2001-2017
    -   Free Software Foundation, Inc.
    +   Copyright (C) 2001-2018 Free Software Foundation, Inc.

We can easily unbreak the testcase without having to go back to
manual edits each year by adding an extra line in the header.

gdb/testsuite/ChangeLog:

	* gdb.base/step-line.c: Add extra empty line in copyright header.
        * gdb.base/step-line.inp: Likewise.

Tested on x86_64-linux. Pushed to master.

Thanks (and sorry!),

Patch

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 9ef8dd1be5..5f32d89c29 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@ 
+2018-01-03  Joel Brobecker  <brobecker@adacore.com>
+
+	* gdb.base/step-line.c: Add extra empty line in copyright header.
+	* gdb.base/step-line.inp: Likewise.
+
 2018-01-02  Joel Brobecker  <brobecker@adacore.com>
 
 	* gdb.ada/dyn_stride.exp: Add slice test.
diff --git a/gdb/testsuite/gdb.base/step-line.c b/gdb/testsuite/gdb.base/step-line.c
index 419d89ff52..d56489bb23 100644
--- a/gdb/testsuite/gdb.base/step-line.c
+++ b/gdb/testsuite/gdb.base/step-line.c
@@ -1,4 +1,5 @@ 
 /* Test step/next in presence of #line directives.
+
    Copyright (C) 2001-2018 Free Software Foundation, Inc.
 
    This file is part of GDB.
diff --git a/gdb/testsuite/gdb.base/step-line.inp b/gdb/testsuite/gdb.base/step-line.inp
index c272887129..8004a9fcbd 100644
--- a/gdb/testsuite/gdb.base/step-line.inp
+++ b/gdb/testsuite/gdb.base/step-line.inp
@@ -1,4 +1,5 @@ 
 # Test step/next in presence of #line directives
+
 # Copyright (C) 2001-2018 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify