From patchwork Wed Jan 3 03:59:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Brobecker X-Patchwork-Id: 25189 Received: (qmail 51109 invoked by alias); 3 Jan 2018 03:59:25 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 51098 invoked by uid 89); 3 Jan 2018 03:59:25 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=Hx-languages-length:2797 X-HELO: rock.gnat.com Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 03 Jan 2018 03:59:23 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 70C23117510 for ; Tue, 2 Jan 2018 22:59:22 -0500 (EST) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 0roITeh+OuS7 for ; Tue, 2 Jan 2018 22:59:22 -0500 (EST) Received: from joel.gnat.com (localhost.localdomain [127.0.0.1]) by rock.gnat.com (Postfix) with ESMTP id 0C6EB1174F7 for ; Tue, 2 Jan 2018 22:59:22 -0500 (EST) Received: by joel.gnat.com (Postfix, from userid 1000) id E86EE809B6; Wed, 3 Jan 2018 07:59:17 +0400 (+04) From: Joel Brobecker To: gdb-patches@sourceware.org Subject: [pushed] Unbreak spurious fails in gdb.base/step-line.exp Date: Wed, 3 Jan 2018 07:59:16 +0400 Message-Id: <20180103035916.3526-1-brobecker@adacore.com> 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!), 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 + + * gdb.base/step-line.c: Add extra empty line in copyright header. + * gdb.base/step-line.inp: Likewise. + 2018-01-02 Joel Brobecker * 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