[patch] python testsuite disappearing py-objfile-script-gdb.py

[patch] python testsuite disappearing py-objfile-script-gdb.py

[Matt Rice]

[-- Attachment #1: Type: text/plain, Size: 1030 bytes --]

this fixes that py-objfile-script-gdb.py disappears when running the
testsuite with an
in-tree build.

had to rename the source file, since the auto-loading API is expecting
the destination
file to use the current name.

I'd also tried special casing the
remote_file host delete ${remote_python_file}

but couldn't figure out some dejagnu equivalent of if is_remote ||
(!is_remote && ${srcdir} == ".")
that special casing leaves it attempting to copy the file onto itself,
but dejagnu
seems to silently ignore that error.

The file hasn't been modified since its initial commit, so we aren't
losing a bunch of history,
just the reference to the atomic commit/other files it was first added with.

2011-07-06  Matt Rice <ratmice@gmail.com>

        * gdb.python/py-objfile-script-gdb.py: Renamed to
        py-objfile-script-gdb.py.in.
        * gdb.python/py-objfile-script-gdb.py.in: Renamed from
        py-objfile-script-gdb.py.
        * gdb.python/py-objfile-script.exp: Update reference to
        py-objfile-script-gdb.py.

[-- Attachment #2: foo.diff --]
[-- Type: application/octet-stream, Size: 5312 bytes --]

diff --git a/gdb/testsuite/gdb.python/py-objfile-script-gdb.py b/gdb/testsuite/gdb.python/py-objfile-script-gdb.py
deleted file mode 100644
index c54e9ec..0000000
--- a/gdb/testsuite/gdb.python/py-objfile-script-gdb.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright (C) 2011 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# This file is part of the GDB testsuite.
-
-import re
-
-class pp_ss:
-    def __init__(self, val):
-        self.val = val
-
-    def to_string(self):
-        return "a=<" + str(self.val["a"]) + "> b=<" + str(self.val["b"]) + ">"
-
-def lookup_function (val):
-    "Look-up and return a pretty-printer that can print val."
-
-    # Get the type.
-    type = val.type
-
-    # If it points to a reference, get the reference.
-    if type.code == gdb.TYPE_CODE_REF:
-        type = type.target ()
-
-    # Get the unqualified type, stripped of typedefs.
-    type = type.unqualified ().strip_typedefs ()
-
-    # Get the type name.    
-    typename = type.tag
-
-    if typename == None:
-        return None
-
-    # Iterate over local dictionary of types to determine
-    # if a printer is registered for that type.  Return an
-    # instantiation of the printer if found.
-    for function in pretty_printers_dict:
-        if function.match (typename):
-            return pretty_printers_dict[function] (val)
-        
-    # Cannot find a pretty printer.  Return None.
-
-    return None
-
-def register_pretty_printers ():
-    pretty_printers_dict[re.compile ('^ss$')]  = pp_ss
-
-pretty_printers_dict = {}
-
-register_pretty_printers ()
-gdb.current_progspace().pretty_printers.append (lookup_function)
diff --git a/gdb/testsuite/gdb.python/py-objfile-script-gdb.py.in b/gdb/testsuite/gdb.python/py-objfile-script-gdb.py.in
new file mode 100644
index 0000000..c54e9ec
--- /dev/null
+++ b/gdb/testsuite/gdb.python/py-objfile-script-gdb.py.in
@@ -0,0 +1,63 @@
+# Copyright (C) 2011 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# This file is part of the GDB testsuite.
+
+import re
+
+class pp_ss:
+    def __init__(self, val):
+        self.val = val
+
+    def to_string(self):
+        return "a=<" + str(self.val["a"]) + "> b=<" + str(self.val["b"]) + ">"
+
+def lookup_function (val):
+    "Look-up and return a pretty-printer that can print val."
+
+    # Get the type.
+    type = val.type
+
+    # If it points to a reference, get the reference.
+    if type.code == gdb.TYPE_CODE_REF:
+        type = type.target ()
+
+    # Get the unqualified type, stripped of typedefs.
+    type = type.unqualified ().strip_typedefs ()
+
+    # Get the type name.    
+    typename = type.tag
+
+    if typename == None:
+        return None
+
+    # Iterate over local dictionary of types to determine
+    # if a printer is registered for that type.  Return an
+    # instantiation of the printer if found.
+    for function in pretty_printers_dict:
+        if function.match (typename):
+            return pretty_printers_dict[function] (val)
+        
+    # Cannot find a pretty printer.  Return None.
+
+    return None
+
+def register_pretty_printers ():
+    pretty_printers_dict[re.compile ('^ss$')]  = pp_ss
+
+pretty_printers_dict = {}
+
+register_pretty_printers ()
+gdb.current_progspace().pretty_printers.append (lookup_function)
diff --git a/gdb/testsuite/gdb.python/py-objfile-script.exp b/gdb/testsuite/gdb.python/py-objfile-script.exp
index a87b22a..e79c0b8 100644
--- a/gdb/testsuite/gdb.python/py-objfile-script.exp
+++ b/gdb/testsuite/gdb.python/py-objfile-script.exp
@@ -38,7 +38,7 @@ if { [skip_python_tests] } { continue }
 # Make the -gdb.py script available to gdb, it is automagically loaded by gdb.
 # Care is taken to put it in the same directory as the binary so that
 # gdb will find it.
-set remote_python_file [remote_download host ${srcdir}/${subdir}/${testfile}-gdb.py ${subdir}/${testfile}-gdb.py]
+set remote_python_file [remote_download host ${srcdir}/${subdir}/${testfile}-gdb.py.in ${subdir}/${testfile}-gdb.py]
 
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}

Re: [patch] python testsuite disappearing py-objfile-script-gdb.py

[Doug Evans]

On Wed, Jul 6, 2011 at 7:06 PM, Matt Rice <ratmice@gmail.com> wrote:
> this fixes that py-objfile-script-gdb.py disappears when running the
> testsuite with an
> in-tree build.
>
> had to rename the source file, since the auto-loading API is expecting
> the destination
> file to use the current name.
>
> I'd also tried special casing the
> remote_file host delete ${remote_python_file}
>
> but couldn't figure out some dejagnu equivalent of if is_remote ||
> (!is_remote && ${srcdir} == ".")
> that special casing leaves it attempting to copy the file onto itself,
> but dejagnu
> seems to silently ignore that error.
>
> The file hasn't been modified since its initial commit, so we aren't
> losing a bunch of history,
> just the reference to the atomic commit/other files it was first added with.
>
> 2011-07-06  Matt Rice <ratmice@gmail.com>
>
>        * gdb.python/py-objfile-script-gdb.py: Renamed to
>        py-objfile-script-gdb.py.in.
>        * gdb.python/py-objfile-script-gdb.py.in: Renamed from
>        py-objfile-script-gdb.py.
>        * gdb.python/py-objfile-script.exp: Update reference to
>        py-objfile-script-gdb.py.

ok with me.
Thanks for doing it.

Nit: I think there's no need to have two ChangeLog entries to rename a file.
But no matter.

Re: [patch] python testsuite disappearing py-objfile-script-gdb.py

[Matt Rice]

On Wed, Jul 13, 2011 at 8:57 AM, Doug Evans <dje@google.com> wrote:
> On Wed, Jul 6, 2011 at 7:06 PM, Matt Rice <ratmice@gmail.com> wrote:
>> this fixes that py-objfile-script-gdb.py disappears when running the
>> testsuite with an
>> in-tree build.
>
> ok with me.
> Thanks for doing it.

committed, thanks for the review.