From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 70125 invoked by alias); 1 Jan 2020 08:20:33 -0000 Mailing-List: contact gdb-testers-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-testers-owner@sourceware.org Received: (qmail 70116 invoked by uid 89); 1 Jan 2020 08:20:32 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-15.1 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 autolearn=ham version=3.3.1 spammy= X-HELO: kwanyin.sergiodj.net Received: from kwanyin.sergiodj.net (HELO kwanyin.sergiodj.net) (158.69.185.54) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 01 Jan 2020 08:20:30 +0000 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [binutils-gdb] gdb/copyright.py: Adapt after move of gnulib from gdb to toplevel From: gdb-buildbot@sergiodj.net To: gdb-testers@sourceware.org Message-Id: <51fd40020e1e0b21642cdec9c749f2e3862939ea@gdb-build> Date: Wed, 01 Jan 2020 08:20:00 -0000 X-SW-Source: 2020-q1/txt/msg00023.txt *** TEST RESULTS FOR COMMIT 51fd40020e1e0b21642cdec9c749f2e3862939ea *** commit 51fd40020e1e0b21642cdec9c749f2e3862939ea Author: Joel Brobecker AuthorDate: Wed Jan 1 09:19:14 2020 +0400 Commit: Joel Brobecker CommitDate: Wed Jan 1 09:19:14 2020 +0400 gdb/copyright.py: Adapt after move of gnulib from gdb to toplevel gdb/ChangeLog: * copyright.py: Adapt after move of gnulib directory from gdb directory to toplevel directory. diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ca7960111f..02dff2b35a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-01-01 Joel Brobecker + + * copyright.py: Adapt after move of gnulib directory from gdb + directory to toplevel directory. + 2020-01-01 Joel Brobecker * copyright.py (main): Exit if run from the wrong directory. diff --git a/gdb/copyright.py b/gdb/copyright.py index 7771d9d7f6..e6feb376a9 100644 --- a/gdb/copyright.py +++ b/gdb/copyright.py @@ -45,7 +45,7 @@ def get_update_list(): the files are relative to that root directory. """ result = [] - for gdb_dir in ('gdb', 'sim', 'include/gdb'): + for gdb_dir in ('gdb', 'gnulib', 'sim', 'include/gdb'): for root, dirs, files in os.walk(gdb_dir, topdown=True): for dirname in dirs: reldirname = "%s/%s" % (root, dirname) @@ -80,7 +80,7 @@ def update_files(update_list): os.environ['UPDATE_COPYRIGHT_USE_INTERVALS'] = '2' # Perform the update, and save the output in a string. - update_cmd = ['bash', 'gdb/gnulib/import/extra/update-copyright'] + update_cmd = ['bash', 'gnulib/import/extra/update-copyright'] update_cmd += update_list p = subprocess.Popen(update_cmd, stdout=subprocess.PIPE, @@ -142,13 +142,14 @@ def may_have_copyright_notice(filename): def main (): """The main subprogram.""" - if not os.path.isfile("gnulib/import/extra/update-copyright"): - print "Error: This script must be called from the gdb directory." - sys.exit(1) - root_dir = os.path.dirname(os.getcwd()) os.chdir(root_dir) + if not (os.path.isdir('gdb') and + os.path.isfile("gnulib/import/extra/update-copyright")): + print "Error: This script must be called from the gdb directory." + sys.exit(1) + update_list = get_update_list() update_files (update_list) @@ -185,7 +186,7 @@ def main (): EXCLUDE_LIST = ( 'gdb/nat/glibc_thread_db.h', 'gdb/CONTRIBUTE', - 'gdb/gnulib/import' + 'gnulib/import' ) # Files which should not be modified, either because they are