public inbox for gdb-testers@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] gdb/copyright.py: Adapt after move of gnulib from gdb to toplevel
@ 2020-01-01  8:20 gdb-buildbot
  2020-01-01  8:20 ` Failures on Ubuntu-Aarch64-m64, branch master gdb-buildbot
                   ` (8 more replies)
  0 siblings, 9 replies; 10+ messages in thread
From: gdb-buildbot @ 2020-01-01  8:20 UTC (permalink / raw)
  To: gdb-testers

*** TEST RESULTS FOR COMMIT 51fd40020e1e0b21642cdec9c749f2e3862939ea ***

commit 51fd40020e1e0b21642cdec9c749f2e3862939ea
Author:     Joel Brobecker <brobecker@adacore.com>
AuthorDate: Wed Jan 1 09:19:14 2020 +0400
Commit:     Joel Brobecker <brobecker@adacore.com>
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  <brobecker@adacore.com>
+
+	* copyright.py: Adapt after move of gnulib directory from gdb
+	directory to toplevel directory.
+
 2020-01-01  Joel Brobecker  <brobecker@adacore.com>
 
 	* 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


^ permalink raw reply	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2020-01-01 10:47 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-01  8:20 [binutils-gdb] gdb/copyright.py: Adapt after move of gnulib from gdb to toplevel gdb-buildbot
2020-01-01  8:20 ` Failures on Ubuntu-Aarch64-m64, branch master gdb-buildbot
2020-01-01  9:23 ` Failures on Fedora-i686, " gdb-buildbot
2020-01-01  9:30 ` Failures on Fedora-x86_64-cc-with-index, " gdb-buildbot
2020-01-01  9:42 ` Failures on Fedora-x86_64-m32, " gdb-buildbot
2020-01-01  9:56 ` Failures on Fedora-x86_64-m64, " gdb-buildbot
2020-01-01 10:03 ` Failures on Fedora-x86_64-native-extended-gdbserver-m32, " gdb-buildbot
2020-01-01 10:11 ` Failures on Fedora-x86_64-native-extended-gdbserver-m64, " gdb-buildbot
2020-01-01 10:31 ` Failures on Fedora-x86_64-native-gdbserver-m32, " gdb-buildbot
2020-01-01 10:47 ` Failures on Fedora-x86_64-native-gdbserver-m64, " gdb-buildbot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).