From patchwork Tue Mar 23 07:50:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Li=C5=A1ka?= X-Patchwork-Id: 1457082 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F4NpQ2NCKz9sR4 for ; Tue, 23 Mar 2021 18:50:52 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2B670385BF9E; Tue, 23 Mar 2021 07:50:47 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by sourceware.org (Postfix) with ESMTPS id E713F3858004 for ; Tue, 23 Mar 2021 07:50:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E713F3858004 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mliska@suse.cz X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id D6989AC1D for ; Tue, 23 Mar 2021 07:50:42 +0000 (UTC) From: =?utf-8?q?Martin_Li=C5=A1ka?= Subject: [PATCH][pushed] mklog: fix test_mklog.py tests. To: gcc-patches@gcc.gnu.org Message-ID: Date: Tue, 23 Mar 2021 08:50:42 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 Content-Language: en-US X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" This fixed what I broke in g:c38f679eebffd601d977330f24def69f4b620c93. Thanks, Martin contrib/ChangeLog: * mklog.py: Fix broken tests. --- contrib/mklog.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/contrib/mklog.py b/contrib/mklog.py index 00a001ec5ae..1604f0516d0 100755 --- a/contrib/mklog.py +++ b/contrib/mklog.py @@ -65,13 +65,13 @@ PATCH must be generated using diff(1)'s -up or -cp options """ script_folder = os.path.realpath(__file__) -gcc_root = os.path.dirname(os.path.dirname(script_folder)) +root = os.path.dirname(os.path.dirname(script_folder)) def find_changelog(path): folder = os.path.split(path)[0] while True: - if os.path.exists(os.path.join(args.directory, folder, 'ChangeLog')): + if os.path.exists(os.path.join(root, folder, 'ChangeLog')): return folder folder = os.path.dirname(folder) if folder == '': @@ -277,7 +277,7 @@ if __name__ == '__main__': help='Do not generate function names in ChangeLogs') parser.add_argument('-p', '--fill-up-bug-titles', action='store_true', help='Download title of mentioned PRs') - parser.add_argument('-d', '--directory', default=gcc_root, + parser.add_argument('-d', '--directory', help='Root directory where to search for ChangeLog ' 'files') parser.add_argument('-c', '--changelog', @@ -288,6 +288,8 @@ if __name__ == '__main__': args = parser.parse_args() if args.input == '-': args.input = None + if args.directory: + root = args.directory data = open(args.input) if args.input else sys.stdin if args.update_copyright: